- bugfix on assign attribute at registered template objects

- make handling of modifiers on expression BC to Smarty2

change_log.txt

@@ -1,3 +1,7 @@
+16/03/2010
+- bugfix on assign attribute at registered template objects
+- make handling of modifiers on expression BC to Smarty2
+ 
 15/03/2010
 - bugfix on block plugin calls
 

libs/sysplugins/smarty_internal_compile_private_object_function.php

@@ -1,36 +1,38 @@
 <?php
 /**
-* Smarty Internal Plugin Compile Object Funtion
+ * Smarty Internal Plugin Compile Object Funtion
-* 
+ * 
-* Compiles code for registered objects as function
+ * Compiles code for registered objects as function
-* 
+ * 
-* @package Smarty
+ * @package Smarty
-* @subpackage Compiler
+ * @subpackage Compiler
-* @author Uwe Tews 
+ * @author Uwe Tews 
-*/
+ */
 /**
-* Smarty Internal Plugin Compile Object Function Class
+ * Smarty Internal Plugin Compile Object Function Class
-*/
+ */
 class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase {
     /**
-    * Compiles code for the execution of function plugin
+     * Compiles code for the execution of function plugin
-    * 
+     * 
-    * @param array $args array with attributes from parser
+     * @param array $args array with attributes from parser
-    * @param string $tag name of function
+     * @param string $tag name of function
-    * @param string $methode name of methode to call
+     * @param string $methode name of methode to call
-    * @param object $compiler compiler object
+     * @param object $compiler compiler object
-    * @return string compiled code
+     * @return string compiled code
-    */
+     */
     public function compile($args, $compiler, $tag, $methode)
     {
-        $this->compiler = $compiler; 
+        $this->compiler = $compiler;
-        // This tag does create output
-        $this->compiler->has_output = true;
-
         $this->required_attributes = array();
         $this->optional_attributes = array('_any'); 
         // check and get attributes
-        $_attr = $this->_get_attributes($args); 
+        $_attr = $this->_get_attributes($args);
+        $_assign = null;
+        if (isset($_attr['assign'])) {
+            $_assign = $_attr['assign'];
+            unset($_attr['assign']);
+        } 
         // convert attributes into parameter array string
         if ($this->compiler->smarty->registered_objects[$tag][2]) {
             $_paramsArray = array();
@@ -42,13 +44,19 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
                 } 
             } 
             $_params = 'array(' . implode(",", $_paramsArray) . ')';
-            $output = "<?php echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params},\$_smarty_tpl->smarty,\$_smarty_tpl);?>\n";
+            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params},\$_smarty_tpl->smarty,\$_smarty_tpl)";
         } else {
             $_params = implode(",", $_attr);
-            $output = "<?php echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params});?>\n";
+            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params})";
         } 
+        if (empty($_assign)) {
+            // This tag does create output
+            $this->compiler->has_output = true;
+            $output = "<?php echo {$return};?>\n";
+        } else {
+            $output = "<?php \$_smarty_tpl->assign({$_assign},{$return});?>\n";
+	}
         return $output;
     } 
 } 
-
+?>
-?>