summaryrefslogtreecommitdiff
path: root/django/core
diff options
context:
space:
mode:
authorBuddy Lindsey, Jr <buddy@buddylindsey.com>2016-02-01 11:24:33 -0600
committerTim Graham <timograham@gmail.com>2016-02-01 14:00:08 -0500
commit3a063b0dcc54458731e0c4c5b2eef0032ddd41b2 (patch)
tree479b869109b7c5dfb23c421e04e9dbbffa6f40d1 /django/core
parentfe41a134bcecd0fc7b6905a46bf055fca100fe28 (diff)
[1.9.x] Fixed #26155 -- Skipped URL checks if no ROOTURL_CONF setting.
Backport of 731bdfe68ae8dd332702b1838db44f0efe433e2e from master
Diffstat (limited to 'django/core')
-rw-r--r--django/core/checks/urls.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/django/core/checks/urls.py b/django/core/checks/urls.py
index d2aac61739..387d2b4e98 100644
--- a/django/core/checks/urls.py
+++ b/django/core/checks/urls.py
@@ -1,13 +1,17 @@
from __future__ import unicode_literals
+from django.conf import settings
+
from . import Tags, Warning, register
@register(Tags.urls)
def check_url_config(app_configs, **kwargs):
- from django.core.urlresolvers import get_resolver
- resolver = get_resolver()
- return check_resolver(resolver)
+ if getattr(settings, 'ROOT_URLCONF', None):
+ from django.core.urlresolvers import get_resolver
+ resolver = get_resolver()
+ return check_resolver(resolver)
+ return []
def check_resolver(resolver):