mirror of
https://github.com/smarty-php/smarty.git
synced 2025-08-10 05:14:26 +02:00
- allow integer as attribute name in plugin calls
This commit is contained in:
@@ -1,4 +1,8 @@
|
|||||||
11/18/2009
|
11/18/2009
|
||||||
|
- allow integer as attribute name in plugin calls
|
||||||
|
|
||||||
|
------- beta 4
|
||||||
|
11/18/2009
|
||||||
- observe umask settings when setting file permissions
|
- observe umask settings when setting file permissions
|
||||||
- avoide unneeded cache file creation for subtemplates which did occur in some situations
|
- avoide unneeded cache file creation for subtemplates which did occur in some situations
|
||||||
- make $smarty->_current_file available during compilation for Smarty2 BC
|
- make $smarty->_current_file available during compilation for Smarty2 BC
|
||||||
|
@@ -32,8 +32,12 @@ class Smarty_Internal_Compile_Block_Plugin extends Smarty_Internal_CompileBase {
|
|||||||
// convert attributes into parameter array string
|
// convert attributes into parameter array string
|
||||||
$_paramsArray = array();
|
$_paramsArray = array();
|
||||||
foreach ($_attr as $_key => $_value) {
|
foreach ($_attr as $_key => $_value) {
|
||||||
|
if (is_int($_key)) {
|
||||||
|
$_paramsArray[] = "$_key=>$_value";
|
||||||
|
} else {
|
||||||
$_paramsArray[] = "'$_key'=>$_value";
|
$_paramsArray[] = "'$_key'=>$_value";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
$_params = 'array(' . implode(",", $_paramsArray) . ')';
|
$_params = 'array(' . implode(",", $_paramsArray) . ')';
|
||||||
|
|
||||||
$this->_open_tag($tag, array($_params, $this->compiler->nocache));
|
$this->_open_tag($tag, array($_params, $this->compiler->nocache));
|
||||||
|
@@ -37,8 +37,12 @@ class Smarty_Internal_Compile_Function_Plugin extends Smarty_Internal_CompileBas
|
|||||||
// convert attributes into parameter array string
|
// convert attributes into parameter array string
|
||||||
$_paramsArray = array();
|
$_paramsArray = array();
|
||||||
foreach ($_attr as $_key => $_value) {
|
foreach ($_attr as $_key => $_value) {
|
||||||
|
if (is_int($_key)) {
|
||||||
|
$_paramsArray[] = "$_key=>$_value";
|
||||||
|
} else {
|
||||||
$_paramsArray[] = "'$_key'=>$_value";
|
$_paramsArray[] = "'$_key'=>$_value";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
$_params = 'array(' . implode(",", $_paramsArray) . ')';
|
$_params = 'array(' . implode(",", $_paramsArray) . ')';
|
||||||
// compile code
|
// compile code
|
||||||
$output = '<?php echo $_smarty_tpl->smarty->plugin_handler->' . $tag . '(array(' . $_params . ',$_smarty_tpl->smarty,$_smarty_tpl),\'function\');?>';
|
$output = '<?php echo $_smarty_tpl->smarty->plugin_handler->' . $tag . '(array(' . $_params . ',$_smarty_tpl->smarty,$_smarty_tpl),\'function\');?>';
|
||||||
|
@@ -28,19 +28,20 @@ class Smarty_Internal_Compile_Object_Block_Function extends Smarty_Internal_Comp
|
|||||||
// opening tag of block plugin
|
// opening tag of block plugin
|
||||||
$this->required_attributes = array();
|
$this->required_attributes = array();
|
||||||
$this->optional_attributes = array('_any');
|
$this->optional_attributes = array('_any');
|
||||||
|
|
||||||
// check and get attributes
|
// check and get attributes
|
||||||
$_attr = $this->_get_attributes($args);
|
$_attr = $this->_get_attributes($args);
|
||||||
|
|
||||||
// convert attributes into parameter array string
|
// convert attributes into parameter array string
|
||||||
$_paramsArray = array();
|
$_paramsArray = array();
|
||||||
foreach ($_attr as $_key => $_value) {
|
foreach ($_attr as $_key => $_value) {
|
||||||
|
if (is_int($_key)) {
|
||||||
|
$_paramsArray[] = "$_key=>$_value";
|
||||||
|
} else {
|
||||||
$_paramsArray[] = "'$_key'=>$_value";
|
$_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
|
// 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 {
|
} else {
|
||||||
|
@@ -34,8 +34,12 @@ class Smarty_Internal_Compile_Object_Function extends Smarty_Internal_CompileBas
|
|||||||
// convert attributes into parameter array string
|
// convert attributes into parameter array string
|
||||||
$_paramsArray = array();
|
$_paramsArray = array();
|
||||||
foreach ($_attr as $_key => $_value) {
|
foreach ($_attr as $_key => $_value) {
|
||||||
|
if (is_int($_key)) {
|
||||||
|
$_paramsArray[] = "$_key=>$_value";
|
||||||
|
} else {
|
||||||
$_paramsArray[] = "'$_key'=>$_value";
|
$_paramsArray[] = "'$_key'=>$_value";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
$_params = 'array(' . implode(",", $_paramsArray) . ')';
|
$_params = 'array(' . implode(",", $_paramsArray) . ')';
|
||||||
// compile code
|
// compile code
|
||||||
$output = '<?php echo $_smarty_tpl->smarty->registered_objects[\''.$tag.'\'][0]->' . $methode . '(' . $_params . ',$_smarty_tpl->smarty,$_smarty_tpl);?>';
|
$output = '<?php echo $_smarty_tpl->smarty->registered_objects[\''.$tag.'\'][0]->' . $methode . '(' . $_params . ',$_smarty_tpl->smarty,$_smarty_tpl);?>';
|
||||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user