Ticket #1278: 1278.diff

django/conf/global_settings.py

@@ -138 +138 @@
-    'django.core.context_processors.auth',
-    'django.core.context_processors.debug',
-    'django.core.context_processors.i18n',
+    'django.core.context_processors.media',
-#    'django.core.context_processors.request',
-)
-

django/core/context_processors.py

@@ -42 +42 @@
-
-    return context_extras
-
+def media(request):
+    """
+    Adds context variables for the admin media prefix and the base
+    media URL.
+    
+    """
+    return {'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX,
+            'MEDIA_URL': settings.MEDIA_URL }
+
-def request(request):
-    return {'request': request}
-

docs/settings.txt

@@ -718 +718 @@
-
-    ("django.core.context_processors.auth",
-    "django.core.context_processors.debug",
-
+
+
-
-A tuple of callables that are used to populate the context in ``RequestContext``.
-These callables take a request object as their argument and return a dictionary

docs/templates_python.txt

@@ -291 +291 @@
-
-    ("django.core.context_processors.auth",
-    "django.core.context_processors.debug",
-
+
+
-
-Each processor is applied in order. That means, if one processor adds a
-variable to the context and a second processor adds a variable with the same
@@ -387 +388 @@
-.. _LANGUAGE_CODE setting: ../settings/#language-code
-.. _internationalization docs: ../i18n/
-
+django.core.context_processors.media
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If ``TEMPLATE_CONTEXT_PROCESSORS`` contains this processors, every
+``RequestContext`` will contain these two variables:
+
+    * ``ADMIN_MEDIA_PREFIX`` -- The value of the `ADMIN_MEDIA_PREFIX setting`_.
+    * ``MEDIA_URL`` -- The value of the `MEDIA_URL setting`_.
+
+.. _ADMIN_MEDIA_PREFIX setting: ../settings/#admin-media-prefix
+.. _MEDIA_URL setting: ../settings/#media-url
+
-django.core.context_processors.request
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-