summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-01-09 20:04:14 +0000
committerJannis Leidel <jannis@leidel.info>2010-01-09 20:04:14 +0000
commit73d636f74091930af82d0fb44169f9e3fd6fa45a (patch)
treea4fb347fec34d5dc6a0525e4cd1eaac23f8992d6
parentbacfe3f3e8638433976bf1b12f16a8d975970884 (diff)
Fixed #10717 - Escape result of admin_media_prefix template tag.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/templatetags/adminmedia.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/admin/templatetags/adminmedia.py b/django/contrib/admin/templatetags/adminmedia.py
index 77863435d4..5429810eb9 100644
--- a/django/contrib/admin/templatetags/adminmedia.py
+++ b/django/contrib/admin/templatetags/adminmedia.py
@@ -1,4 +1,5 @@
from django.template import Library
+from django.utils.encoding import iri_to_uri
register = Library()
@@ -10,5 +11,5 @@ def admin_media_prefix():
from django.conf import settings
except ImportError:
return ''
- return settings.ADMIN_MEDIA_PREFIX
+ return iri_to_uri(settings.ADMIN_MEDIA_PREFIX)
admin_media_prefix = register.simple_tag(admin_media_prefix)