Index: branches/release-34/lib/MT/Template/ContextHandlers.pm
===================================================================
--- branches/release-34/lib/MT/Template/ContextHandlers.pm (revision 1855)
+++ branches/release-34/lib/MT/Template/ContextHandlers.pm (revision 1859)
@@ -1418,6 +1418,6 @@
     }
 
-    $ctx->{__stash}{vars}->{__value__} = $value;
-    $ctx->{__stash}{vars}->{__name__} = $var;
+    local $ctx->{__stash}{vars}{__cond_value__} = $value;
+    local $ctx->{__stash}{vars}{__cond_name__} = $var;
 
     if ( my $op = $args->{op} ) {