summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-11-17 15:36:42 +0000
committerJannis Leidel <jannis@leidel.info>2010-11-17 15:36:42 +0000
commit96af304747b4edd6180613bfabe98bac7c8cfdeb (patch)
tree0effeaebaecbc1206fd63f1fe652b13ea0a33300
parent33d8fcde8a317184a627492f008a4eab9333ed88 (diff)
Fixed #10636 -- Added check to make sure the ADMIN_MEDIA_PREFIX setting is properly set before serving files with the AdminMediaHandler.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/servers/basehttp.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py
index 9c3e90043b..96bb178547 100644
--- a/django/core/servers/basehttp.py
+++ b/django/core/servers/basehttp.py
@@ -650,6 +650,11 @@ class AdminMediaHandler(handlers.StaticFilesHandler):
def get_base_url(self):
from django.conf import settings
+ from django.core.exceptions import ImproperlyConfigured
+ if not settings.ADMIN_MEDIA_PREFIX:
+ raise ImproperlyConfigured(
+ "The ADMIN_MEDIA_PREFIX setting can't be empty "
+ "when using the AdminMediaHandler, e.g. with runserver.")
return settings.ADMIN_MEDIA_PREFIX
def file_path(self, url):