Changeset 1876 for branches/release-34/php/lib/MTViewer.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/MTViewer.php (modified) (1 diff)

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