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
@@ -1,22 +1,25 @@
<?php
/**
* Smarty Internal Plugin Compile Append
*
*
* Compiles the {append} tag
*
*
* @package Smarty
* @subpackage Compiler
* @author Uwe Tews
* @author Uwe Tews
*/
/**
* Smarty Internal Plugin Compile Append Class
*
* @package Smarty
* @subpackage Compiler
*/
class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
/**
* Compiles code for the {append} tag
*
*
* @param array $args array with attributes from parser
* @param object $compiler compiler object
* @param array $parameter array with compilation parameter
@@ -24,13 +27,12 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
*/
public function compile($args, $compiler, $parameter)
{
$this->compiler = $compiler;
// the following must be assigned at runtime because it will be overwritten in parent class
$this->required_attributes = array('var', 'value');
$this->shorttag_order = array('var', 'value');
$this->optional_attributes = array('scope','index');
$this->optional_attributes = array('scope', 'index');
// check and get attributes
$_attr = $this->_get_attributes($args);
$_attr = $this->getAttributes($compiler, $args);
// map to compile assign attributes
if (isset($_attr['index'])) {
$_params['smarty_internal_index'] = '[' . $_attr['index'] . ']';
@@ -41,10 +43,11 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
$_new_attr = array();
foreach ($_attr as $key => $value) {
$_new_attr[] = array($key => $value);
}
}
// call compile assign
return parent::compile($_new_attr, $compiler, $_params);
}
}
}
}
?>