From c260c533e1f1553548fc98f24820805af87f72bf Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 8 Mar 2011 13:43:53 +0000 Subject: Fixed #15570 -- Corrected a flaw in the design of the silent flag on {% cycle %}. Thanks to Brian Neal for the report, and to Andrew and Jannis for the design consult. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15773 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/template/defaulttags.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django') diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 0662b5f2e7..ff97d92d75 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -111,12 +111,12 @@ class CycleNode(Node): if self not in context.render_context: # First time the node is rendered in template context.render_context[self] = itertools_cycle(self.cyclevars) - if self.silent: - return '' cycle_iter = context.render_context[self] value = cycle_iter.next().resolve(context) if self.variable_name: context[self.variable_name] = value + if self.silent: + return '' return value class DebugNode(Node): -- cgit v1.3