mirror of
https://github.com/smarty-php/smarty.git
synced 2025-08-04 02:14:26 +02:00
- bugfix array_merge() parameter should be checked https://github.com/smarty-php/smarty/issues/350
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
===== 3.1.32 - dev ===
|
||||
13.4.2017
|
||||
- bugfix array_merge() parameter should be checked https://github.com/smarty-php/smarty/issues/350
|
||||
|
||||
===== 3.1.31 ===== (14.12.2016)
|
||||
23.11.2016
|
||||
|
@@ -663,8 +663,12 @@ abstract class Smarty_Internal_TemplateCompilerBase
|
||||
// if compiler function plugin call it now
|
||||
if ($plugin_type == Smarty::PLUGIN_COMPILER) {
|
||||
$new_args = array();
|
||||
foreach ($args as $mixed) {
|
||||
$new_args = array_merge($new_args, $mixed);
|
||||
foreach ($args as $key => $mixed) {
|
||||
if (is_array($mixed)) {
|
||||
$new_args = array_merge($new_args, $mixed);
|
||||
} else {
|
||||
$new_args[ $key ] = $mixed;
|
||||
}
|
||||
}
|
||||
return call_user_func_array($this->default_handler_plugins[ $plugin_type ][ $tag ][ 0 ],
|
||||
array($new_args, $this));
|
||||
|
Reference in New Issue
Block a user