- allow integer as attribute name in plugin calls

change_log.txt

@@ -1,4 +1,8 @@
 11/18/2009
+- allow integer as attribute name in plugin calls
+
+------- beta 4
+11/18/2009
 - observe umask settings when setting file permissions
 - avoide unneeded cache file creation for subtemplates which did occur in some situations
 - make $smarty->_current_file available during compilation for Smarty2 BC

libs/sysplugins/smarty_internal_compile_block_plugin.php

@@ -32,7 +32,11 @@ class Smarty_Internal_Compile_Block_Plugin extends Smarty_Internal_CompileBase {
             // convert attributes into parameter array string
             $_paramsArray = array();
             foreach ($_attr as $_key => $_value) {
-                $_paramsArray[] = "'$_key'=>$_value";
+                if (is_int($_key)) {
+                    $_paramsArray[] = "$_key=>$_value";
+                } else {
+                    $_paramsArray[] = "'$_key'=>$_value";
+                } 
             } 
             $_params = 'array(' . implode(",", $_paramsArray) . ')';
 
@@ -41,15 +45,15 @@ class Smarty_Internal_Compile_Block_Plugin extends Smarty_Internal_CompileBase {
             if (isset($this->compiler->smarty->registered_plugins[$tag]) && !$this->compiler->smarty->registered_plugins[$tag][2]) {
                 $this->compiler->nocache = true;
             } 
-			// maybe nocache because of nocache variables
+            // maybe nocache because of nocache variables
-			$this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache;
+            $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; 
-			// compile code
+            // compile code
             $output = '<?php $_block_repeat=true; $_smarty_tpl->smarty->plugin_handler->' . $tag . '(array(' . $_params . ', null, $_smarty_tpl->smarty, &$_block_repeat, $_smarty_tpl),\'block\');while ($_block_repeat) { ob_start();?>';
         } else {
-			// must endblock be nocache?
+            // must endblock be nocache?
-			if ($this->compiler->nocache) {
+            if ($this->compiler->nocache) {
-                 $this->compiler->tag_nocache = true;
+                $this->compiler->tag_nocache = true;
-            }
+            } 
             // closing tag of block plugin, restore nocache
             list($_params, $this->compiler->nocache) = $this->_close_tag(substr($tag, 0, -5)); 
             // This tag does create output

libs/sysplugins/smarty_internal_compile_function_plugin.php

@@ -29,15 +29,19 @@ class Smarty_Internal_Compile_Function_Plugin extends Smarty_Internal_CompileBas
         $this->required_attributes = array();
         $this->optional_attributes = array('_any'); 
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
+        $_attr = $this->_get_attributes($args); 
         // not cachable?
         if (isset($this->compiler->smarty->registered_plugins[$tag]) && !$this->compiler->smarty->registered_plugins[$tag][2]) {
-            $this->compiler->tag_nocache = true;        
+            $this->compiler->tag_nocache = true;
-        }
+        } 
         // convert attributes into parameter array string
         $_paramsArray = array();
         foreach ($_attr as $_key => $_value) {
-            $_paramsArray[] = "'$_key'=>$_value";
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            } 
         } 
         $_params = 'array(' . implode(",", $_paramsArray) . ')'; 
         // compile code

libs/sysplugins/smarty_internal_compile_object_block_function.php

@@ -23,33 +23,34 @@ class Smarty_Internal_Compile_Object_Block_Function extends Smarty_Internal_Comp
     */
     public function compile($args, $compiler, $tag, $methode)
     {
-        $this->compiler = $compiler; 
+        $this->compiler = $compiler;
         if (strlen($tag) < 5 || substr_compare($tag, 'close', -5, 5) != 0) {
             // opening tag of block plugin
             $this->required_attributes = array();
             $this->optional_attributes = array('_any'); 
-
             // check and get attributes
-            $_attr = $this->_get_attributes($args);
+            $_attr = $this->_get_attributes($args); 
-
             // convert attributes into parameter array string
             $_paramsArray = array();
             foreach ($_attr as $_key => $_value) {
-                $_paramsArray[] = "'$_key'=>$_value";
+                if (is_int($_key)) {
+                    $_paramsArray[] = "$_key=>$_value";
+                } else {
+                    $_paramsArray[] = "'$_key'=>$_value";
+                } 
             } 
-            $_params = 'array(' . implode(",", $_paramsArray) . ')'; 
+            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-            
-            $this->_open_tag($tag.'->'.$methode, $_params);
 
+            $this->_open_tag($tag . '->' . $methode, $_params); 
             // compile code
-            $output = '<?php $_block_repeat=true; $_smarty_tpl->smarty->registered_objects[\''.$tag.'\'][0]->' . $methode . '(' . $_params . ', null, $_smarty_tpl->smarty, $_block_repeat, $_smarty_tpl);while ($_block_repeat) { ob_start();?>';
+            $output = '<?php $_block_repeat=true; $_smarty_tpl->smarty->registered_objects[\'' . $tag . '\'][0]->' . $methode . '(' . $_params . ', null, $_smarty_tpl->smarty, $_block_repeat, $_smarty_tpl);while ($_block_repeat) { ob_start();?>';
         } else {
             // closing tag of block plugin
-            $_params = $this->_close_tag(substr($tag,0,-5).'->'.$methode);
+            $_params = $this->_close_tag(substr($tag, 0, -5) . '->' . $methode); 
             // This tag does create output
-            $this->compiler->has_output = true;
+            $this->compiler->has_output = true; 
             // compile code
-            $output = '<?php $_block_content = ob_get_contents(); ob_end_clean(); $_block_repeat=false; echo $_smarty_tpl->smarty->registered_objects[\''.substr($tag,0,-5).'\'][0]->' . $methode . '(' . $_params . ', $_block_content, $_smarty_tpl->smarty, $_block_repeat, $_smarty_tpl); }?>';
+            $output = '<?php $_block_content = ob_get_contents(); ob_end_clean(); $_block_repeat=false; echo $_smarty_tpl->smarty->registered_objects[\'' . substr($tag, 0, -5) . '\'][0]->' . $methode . '(' . $_params . ', $_block_content, $_smarty_tpl->smarty, $_block_repeat, $_smarty_tpl); }?>';
         } 
         return $output;
     } 

libs/sysplugins/smarty_internal_compile_object_function.php

@@ -34,7 +34,11 @@ class Smarty_Internal_Compile_Object_Function extends Smarty_Internal_CompileBas
         // convert attributes into parameter array string
         $_paramsArray = array();
         foreach ($_attr as $_key => $_value) {
-            $_paramsArray[] = "'$_key'=>$_value";
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            } 
         } 
         $_params = 'array(' . implode(",", $_paramsArray) . ')'; 
         // compile code