Changeset 1862

Timestamp:

04/11/08 15:09:30 (15 months ago)

Author:

fumiakiy

Message:

Re-fixed mtif stomping on name and value variables. BugId:79027

Also fixed mtelseif tag did not work when tag argument was specified. BugId:69678

Location:

branches/release-34/lib/MT

Files:

• Builder.pm (modified) (1 diff)
• Template/ContextHandlers.pm (modified) (4 diffs)

branches/release-34/lib/MT/Builder.pm

@@ -401 +401 @@
                     local $vars->{__value__} = delete $vars->{__cond_value__};
                     local $vars->{__name__}  = delete $vars->{__cond_name__};
+                    delete $vars->{__cond_tag__};
                     $out = $out ? $ctx->slurp(\%args, $cond) : $ctx->else(\%args, $cond);
                     return $build->error(MT->translate("Error in <mt[_1]> tag: [_2]", $t->[0], $ctx->errstr))

branches/release-34/lib/MT/Template/ContextHandlers.pm

@@ -1349 +1349 @@
     local $args->{'@'};
     delete $args->{'@'};
-    if  ((keys %$args) == 1) {
-        my $name = $args->{name} || $args->{var} || $args->{tag} || undef;
-        $name = ($ctx->var('__name__') || undef) unless $name;
-        $args->{name} = $name if $name;
+    if  ((keys %$args) >= 1) {
+        unless ($args->{name} || $args->{var} || $args->{tag}) {
+            if ( my $t = $ctx->var('__cond_tag__') ) {
+                $args->{tag} = $t;
+            }
+            elsif ( my $n = $ctx->var('__cond_name__') ) {
+                $args->{name} = $n;
+            }
+        }
     }
     if (%$args) {
@@ -1363 +1368 @@
 sub _hdlr_elseif {
     my ($ctx, $args, $cond) = @_;
-    $args->{name} = $ctx->var('__name__')
-        unless ($args->{name} || $args->{var} || $args->{tag} || undef);
+    unless ($args->{name} || $args->{var} || $args->{tag}) {
+        if ( my $t = $ctx->var('__cond_tag__') ) {
+            $args->{tag} = $t;
+        }
+        elsif ( my $n = $ctx->var('__cond_name__') ) {
+            $args->{name} = $n;
+        }
+    }
     return _hdlr_else($ctx, $args, $cond);
 }
@@ -1412 +1423 @@
                 $value = $ph->($ctx, $args, $value);
             }
+            $ctx->{__stash}{vars}{__cond_tag__} = $args->{tag};
         }
         else {
@@ -1418 +1430 @@
     }
 
-    local $ctx->{__stash}{vars}{__cond_value__} = $value;
-    local $ctx->{__stash}{vars}{__cond_name__} = $var;
+    $ctx->{__stash}{vars}{__cond_value__} = $value;
+    $ctx->{__stash}{vars}{__cond_name__} = $var;
 
     if ( my $op = $args->{op} ) {