Render footer properly as a request context

ikevin · Oct 7, 2015 · e3c5879 · e3c5879
1 parent f56adf6
commit e3c5879
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/readthedocs/core/context_processors.py b/readthedocs/core/context_processors.py
@@ -7,6 +7,7 @@ def readthedocs_processor(request):
         'PRODUCTION_DOMAIN': getattr(settings, 'PRODUCTION_DOMAIN', None),
         'USE_SUBDOMAINS': getattr(settings, 'USE_SUBDOMAINS', None),
         'GLOBAL_ANALYTICS_CODE': getattr(settings, 'GLOBAL_ANALYTICS_CODE', 'UA-17997319-1'),
-        'TEMPLATE_ROOT': getattr(settings, 'TEMPLATE_ROOT', None) + '/',
+        'SITE_ROOT': getattr(settings, 'SITE_ROOT', '') + '/',
+        'TEMPLATE_ROOT': getattr(settings, 'TEMPLATE_ROOT', '') + '/',
     }
     return exports
diff --git a/readthedocs/restapi/views/footer_views.py b/readthedocs/restapi/views/footer_views.py
@@ -1,7 +1,6 @@
 from django.shortcuts import get_object_or_404
-from django.template import loader as template_loader
+from django.template import RequestContext, loader as template_loader
 from django.conf import settings
-from django.core.context_processors import csrf
 
 from rest_framework import decorators, permissions
 from rest_framework.renderers import JSONPRenderer, JSONRenderer, BrowsableAPIRenderer
@@ -121,8 +120,8 @@ def footer_html(request):
         'bitbucket_url': version.get_bitbucket_url(docroot, page_slug, source_suffix),
     }
 
-    context.update(csrf(request))
-    html = template_loader.get_template('restapi/footer.html').render(context)
+    request_context = RequestContext(request, context)
+    html = template_loader.get_template('restapi/footer.html').render(request_context)
     resp_data = {
         'html': html,
         'version_active': version.active,