summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorPaweł Marczewski <pwmarcz@gmail.com>2015-05-26 21:38:01 +0200
committerTim Graham <timograham@gmail.com>2015-05-27 10:08:31 -0400
commit7ee6043dba983bd30bdb880a216cb573d76c7fc5 (patch)
tree964735baed9a23f245ab6db02788e854ab6138ec /django
parentd411586866f7efe797b2d567028d9b7d0712c88e (diff)
Fixed #24847 -- Prevented items set on a RequestContext from being lost.
Backport of 300e8baf9429dbf1c5dff478558d793638dc2f54 from master
Diffstat (limited to 'django')
-rw-r--r--django/template/context.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/django/template/context.py b/django/template/context.py
index af4fb8853b..e77866cc5d 100644
--- a/django/template/context.py
+++ b/django/template/context.py
@@ -219,7 +219,13 @@ class RequestContext(Context):
self.request = request
self._processors = () if processors is None else tuple(processors)
self._processors_index = len(self.dicts)
- self.update({}) # placeholder for context processors output
+
+ # placeholder for context processors output
+ self.update({})
+
+ # empty dict for any new modifications
+ # (so that context processors don't overwrite them)
+ self.update({})
@contextmanager
def bind_template(self, template):