Ticket #23789: ticket_23789.patch

django/template/response.py

@@ -154 +154 @@
         """
         if isinstance(context, Context):
             return context
-        return RequestContext(self._request, context, current_app=self._current_app)
+        context_instance = RequestContext(self._request, current_app=self._current_app)
+        if context:
+            context_instance.push(context)
+        return context_instance

tests/template_tests/test_response.py

@@ -233 +233 @@
                                   Context({'foo': 'bar'})).render()
         self.assertEqual(response.content, b'bar')
 
+    def test_context_processor_priority(self):
+        # context processors should be overridden by passed-in context
+        response = self._response('{{ foo }}{{ processors }}',
+                                  {'processors': 'no'}).render()
+        self.assertEqual(response.content, b'no')
+
     def test_kwargs(self):
         response = self._response(content_type='application/json',
                                   status=504)