Skip to content
Browse files

Fixed #546 - render_to_string and render_to_response may now take lis…

…ts of templates and use select_template instead of get_template. Thanks, hugo

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 808b3f4 commit 152d4373053b3148a401bf8a320dfa76b60cca86 @jacobian jacobian committed
Showing with 7 additions and 2 deletions.
  1. +7 −2 django/core/
9 django/core/
@@ -22,10 +22,15 @@ def get_template_from_string(source):
def render_to_string(template_name, dictionary=None, context_instance=None):
Loads the given template_name and renders it with the given dictionary as
- context. Returns a string.
+ context. The template_name may be a string to load a single template using
+ 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 {}
- t = get_template(template_name)
+ if isinstance(template_name, (list, tuple)):
+ t = select_template(template_name)
+ else:
+ t = get_template(template_name)
if context_instance:

0 comments on commit 152d437

Please sign in to comment.
Something went wrong with that request. Please try again.