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

Fixed #21741 -- Fixed render_to_string to stop pushing empty dictionaries to its Context

Browse Source 
Thanks to kezabelle for the report and original patch
and to numerodix for his improved patch.
This commit is contained in:
Baptiste Mispelon
2014-02-22 22:28:27 +01:00
parent 1d3ae4760b
commit 7e1376c2b0
4 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
django/template/loader.py
View File

@@ -164,13 +164,14 @@ def render_to_string(template_name, dictionary=None, context_instance=None,
get_template, or it may be a tuple to use select_template to find one of
the templates in the list. Returns a string.
"""
dictionary = dictionary or {}
if isinstance(template_name, (list, tuple)):
t = select_template(template_name, dirs)
else:
t = get_template(template_name, dirs)
if not context_instance:
return t.render(Context(dictionary))
if not dictionary:
return t.render(context_instance)
# Add the dictionary to the context stack, ensuring it gets removed again
# to keep the context_instance in the same state it started in.
with context_instance.push(dictionary):