1
0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00

Reverted deprecation of media context processor (from r14293) to separate static files and media files a bit more.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel
2010-11-11 21:44:33 +00:00
parent 63023e6ad9
commit 70edd4e103
6 changed files with 7 additions and 25 deletions

View File

@@ -71,15 +71,7 @@ def media(request):
Adds media-related context variables to the context.
"""
import warnings
warnings.warn(
"The context processor at `django.core.context_processors.media` is " \
"deprecated; use the path `django.contrib.staticfiles.context_processors.staticfiles` " \
"instead.",
PendingDeprecationWarning
)
from django.contrib.staticfiles.context_processors import staticfiles as staticfiles_context_processor
return staticfiles_context_processor(request)
return {'MEDIA_URL': settings.MEDIA_URL}
def request(request):
return {'request': request}