mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Fixed #533 -- Fixed bug when using custom context_instance in load_and_render(). Thanks, Brantley 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-09-21 21:41:37 +00:00
parent 0505000533
commit a6946dac54
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/core/extensions.py
View File

@ -9,10 +9,10 @@ def load_and_render(template_name, dictionary=None, context_instance=None):
dictionary = dictionary or {} dictionary = dictionary or {}
t = template_loader.get_template(template_name) t = template_loader.get_template(template_name)
if context_instance: if context_instance:
c = context_instance.update(dictionary) context_instance.update(dictionary)
else: else:
c = Context(dictionary) context_instance = Context(dictionary)
return HttpResponse(t.render(c)) return HttpResponse(t.render(context_instance))
class DjangoContext(Context): class DjangoContext(Context):
""" """