Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #533 -- Fixed bug when using custom context_instance in load_an…

…d_render(). Thanks, Brantley

git-svn-id: http://code.djangoproject.com/svn/django/trunk@657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit a6946dac54380483126bb00807ea2974142f6605 1 parent 0505000
@adrianholovaty adrianholovaty authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 django/core/extensions.py
View
6 django/core/extensions.py
@@ -9,10 +9,10 @@ def load_and_render(template_name, dictionary=None, context_instance=None):
dictionary = dictionary or {}
t = template_loader.get_template(template_name)
if context_instance:
- c = context_instance.update(dictionary)
+ context_instance.update(dictionary)
else:
- c = Context(dictionary)
- return HttpResponse(t.render(c))
+ context_instance = Context(dictionary)
+ return HttpResponse(t.render(context_instance))
class DjangoContext(Context):
"""
Please sign in to comment.
Something went wrong with that request. Please try again.