Changeset 1876

Timestamp:

04/13/08 07:01:19 (15 months ago)

Author:

fumiakiy

Message:

Fixed the issue in which MTElse and MTElseIf did not work correctly when "name" or "tag" argument was omitted both in static and in dynamic. BugId:69678

Also fixed the bug case filed as BugId:79027 in PHP tag handlers.

Location:

branches/release-34

Files:

• lib/MT/Builder.pm (modified) (1 diff)
• php/lib/MTViewer.php (modified) (1 diff)
• php/lib/block.mtif.php (modified) (2 diffs)

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

@@ -401 +401 @@
                     local $vars->{__value__} = delete $vars->{__cond_value__};
                     local $vars->{__name__}  = delete $vars->{__cond_name__};
+                    $out = $out ? $ctx->slurp(\%args, $cond) : $ctx->else(\%args, $cond);
                     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))
                         unless defined $out;

branches/release-34/php/lib/MTViewer.php

@@ -249 +249 @@
         }
         if ((count($args) > 0) && (!isset($args['name']) && !isset($args['var']) && !isset($args['tag']))) {
-            require_once("function.mtgetvar.php");
-            $var = smarty_function_mtgetvar(array('name' => '__name__'), $ctx);
-            if (isset($var) && $var != '')
-                $args['name'] = $var;
+            $vars =& $ctx->__stash['vars'];
+            if ( array_key_exists('__cond_tag__', $vars) ) {
+                $tag = $vars['__cond_tag__'];
+                unset($vars['__cond_tag__']);
+                if ( isset($tag) && $tag )
+                    $args['tag'] = $tag;
+            }
+            else if ( array_key_exists('__cond_name__', $vars) ) {
+                $name = $vars['__cond_name__'];
+                unset($vars['__cond_name__']);
+                if ( isset($name) && $name )
+                    $args['name'] = $name;
+            }
+            if ( array_key_exists('__cond_value__', $vars) ) {
+                $value = $vars['__cond_value__'];
+                unset($vars['__cond_value__']);
+                if ( isset($value) && $value )
+                    $args['value'] = $value;
+            }
+            $ctx->__stash['vars'] =& $vars;
         }
         if (count($args) >= 1) { # else-if case

branches/release-34/php/lib/block.mtif.php

@@ -78 +78 @@
         }
 
-        if (isset($args['name']))
-            $var_key = $args['name'];
-        else if(isset($args['var']))
-            $var_key = $args['var'];
-        else if(isset($args['tag']))
-            $var_key = $args['tag'];
         require_once("function.mtsetvar.php");
-        smarty_function_mtsetvar(array('name' => '__name__', 'value' => $var_key), $ctx);
-        smarty_function_mtsetvar(array('name' => '__value__', 'value' => $val), $ctx);
+        if(isset($args['tag'])) {
+            smarty_function_mtsetvar(array('name' => '__cond_tag__', 'value' => $args['tag']), $ctx);
+        }
+        else {
+            if (isset($args['name']))
+                $var_key = $args['name'];
+            else if(isset($args['var']))
+                $var_key = $args['var'];
+            smarty_function_mtsetvar(array('name' => '__cond_name__', 'value' => $var_key), $ctx);
+        }
+        smarty_function_mtsetvar(array('name' => '__cond_value__', 'value' => $val), $ctx);
 
         if ( array_key_exists('op', $args) ) {
@@ -140 +143 @@
     } else {
         $vars =& $ctx->__stash['vars'];
-        unset($vars['__name__']);
-        unset($vars['__value__']);
         return $ctx->_hdlr_if($args, $content, $ctx, $repeat);
     }