diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-04-11 13:00:38 +0000 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-04-11 13:00:38 +0000 |
| commit | f0697570e916022637c6147de3f1dfb2eb360ea6 (patch) | |
| tree | ebaa149ba5f7fadee960a0276d01f60ff517694e | |
| parent | f5a9e5e92867344b6251fdf58c05717b2ef26018 (diff) | |
Fixed #18103 -- Regression introduced in r17895.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/template/context.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/template/context.py b/django/template/context.py index 8a5f0d3c54..a7df61af16 100644 --- a/django/template/context.py +++ b/django/template/context.py @@ -19,9 +19,9 @@ class BaseContext(object): def _reset_dicts(self, value=None): builtins = {'True': True, 'False': False, 'None': None} - if value: - builtins.update(value) self.dicts = [builtins] + if value is not None: + self.dicts.append(value) def __copy__(self): duplicate = copy(super(BaseContext, self)) |
