Changeset 1876 for branches/release-34/php/lib/block.mtif.php

Timestamp:

04/13/08 07:01:19 (20 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.

Files:

• branches/release-34/php/lib/block.mtif.php (modified) (2 diffs)

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);
     }