commit 3.1 into the trunk

This commit is contained in:
monte.ohrt
2011-09-16 14:19:56 +00:00
parent 5693de91f5
commit 8842e79107
136 changed files with 14349 additions and 7805 deletions

View File

@@ -1,25 +1,40 @@
<?php
/**
* Smarty Internal Plugin Compile Function Plugin
*
*
* Compiles code for the execution of function plugin
*
*
* @package Smarty
* @subpackage Compiler
* @author Uwe Tews
* @author Uwe Tews
*/
/**
* Smarty Internal Plugin Compile Function Plugin Class
*
* @package Smarty
* @subpackage Compiler
*/
class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase {
// attribute definitions
/**
* Attribute definition: Overwrites base class.
*
* @var array
* @see Smarty_Internal_CompileBase
*/
public $required_attributes = array();
public $optional_attributes = array('_any');
/**
* Attribute definition: Overwrites base class.
*
* @var array
* @see Smarty_Internal_CompileBase
*/
public $optional_attributes = array('_any');
/**
* Compiles code for the execution of function plugin
*
*
* @param array $args array with attributes from parser
* @param object $compiler compiler object
* @param array $parameter array with compilation parameter
@@ -29,14 +44,13 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
*/
public function compile($args, $compiler, $parameter, $tag, $function)
{
$this->compiler = $compiler;
// This tag does create output
$this->compiler->has_output = true;
$compiler->has_output = true;
// check and get attributes
$_attr = $this->_get_attributes($args);
$_attr = $this->getAttributes($compiler, $args);
if ($_attr['nocache'] === true) {
$this->compiler->tag_nocache = true;
$compiler->tag_nocache = true;
}
unset($_attr['nocache']);
// convert attributes into parameter array string
@@ -46,13 +60,14 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
$_paramsArray[] = "$_key=>$_value";
} else {
$_paramsArray[] = "'$_key'=>$_value";
}
}
$_params = 'array(' . implode(",", $_paramsArray) . ')';
}
}
$_params = 'array(' . implode(",", $_paramsArray) . ')';
// compile code
$output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
return $output;
}
}
}
}
?>