Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #18103 -- Regression introduced in r17895.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f0697570e916022637c6147de3f1dfb2eb360ea6 1 parent f5a9e5e
Aymeric Augustin authored April 11, 2012

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. 4  django/template/context.py
4  django/template/context.py
@@ -19,9 +19,9 @@ def __init__(self, dict_=None):
19 19
 
20 20
     def _reset_dicts(self, value=None):
21 21
         builtins = {'True': True, 'False': False, 'None': None}
22  
-        if value:
23  
-            builtins.update(value)
24 22
         self.dicts = [builtins]
  23
+        if value is not None:
  24
+            self.dicts.append(value)
25 25
 
26 26
     def __copy__(self):
27 27
         duplicate = copy(super(BaseContext, self))

0 notes on commit f069757

Please sign in to comment.
Something went wrong with that request. Please try again.