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

1 files changed, 3 insertions, 3 deletions

diff --git a/django/core/extensions.py b/django/core/extensions.py
index fce9011fc0..17e1c76734 100644
--- a/django/core/extensions.py
+++ b/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):
     """