Fixed #15092 -- Made `{% now %}` work with single-quoted string arguments. Thanks to ninja_otoko for the report and to steveire, Aymeric Augustin and Claude Paroz for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17391 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 3 insertions, 3 deletions

diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 701515a66d..fa54f457c8 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -1049,10 +1049,10 @@ def now(parser, token):
 
         It is {% now "jS F Y H:i" %}
     """
-    bits = token.contents.split('"')
-    if len(bits) != 3:
+    bits = token.split_contents()
+    if len(bits) != 2:
         raise TemplateSyntaxError("'now' statement takes one argument")
-    format_string = bits[1]
+    format_string = bits[1][1:-1]
     return NowNode(format_string)
 
 @register.tag