mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixes #1338, Refs #1400, #2237 -- Modified variable resolution to allow template 'if' statements to work if TEMPLATE_STRING_IF_INVALID is set. Modified unit tests to force the use of this variable, so that returning '' isn't confused with an actual failure.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee
2006-07-04 03:21:44 +00:00
parent 009f224e57
commit 6b383afd39
4 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/template/context.py
View File

@@ -37,7 +37,7 @@ class Context(object):
for d in self.dicts:
if d.has_key(key):
return d[key]
return settings.TEMPLATE_STRING_IF_INVALID
raise KeyError(key)
def __delitem__(self, key):
"Delete a variable from the current context"
@@ -49,7 +49,7 @@ class Context(object):
return True
return False
def get(self, key, otherwise):
def get(self, key, otherwise=None):
for d in self.dicts:
if d.has_key(key):
return d[key]