diff options
| author | Tom Christie | 2011-12-20 04:19:42 -0800 |
|---|---|---|
| committer | Tom Christie | 2011-12-20 04:19:42 -0800 |
| commit | ebbc60a640be90424919a3995bfdf17b3ee3ddb2 (patch) | |
| tree | 7f87cc91ee43ecb64a419f96aa67139c2c13fda0 | |
| parent | 8af629f566f3973589256021501cb51b9a5383a7 (diff) | |
| parent | 9f63e8dd1d23f9975e90e92d9aaf3def321b5e9b (diff) | |
| download | django-rest-framework-ebbc60a640be90424919a3995bfdf17b3ee3ddb2.tar.bz2 | |
Merge pull request #97 from anemitz/master
ADMIN_MEDIA_PREFIX no longer supported in django1.4
| -rw-r--r-- | djangorestframework/renderers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/djangorestframework/renderers.py b/djangorestframework/renderers.py index aae2cab2..3f951ba1 100644 --- a/djangorestframework/renderers.py +++ b/djangorestframework/renderers.py @@ -326,7 +326,7 @@ class DocumentingTemplateRenderer(BaseRenderer): 'logout_url': logout_url, 'FORMAT_PARAM': self._FORMAT_QUERY_PARAM, 'METHOD_PARAM': getattr(self.view, '_METHOD_PARAM', None), - 'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX + 'ADMIN_MEDIA_PREFIX': getattr(settings, 'ADMIN_MEDIA_PREFIX', None), }) ret = template.render(context) |