smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 10:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix multiple {include} with relative filepath within {block}{/block} could fail https://github.com/smarty-php/smarty/issues/246 (reverted from commit 09d8eab89f)

Browse Source
This commit is contained in:
uwetews
2016-07-19 00:14:51 +02:00
parent 09d8eab89f
commit 3fdd9e4b89
1 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
libs/sysplugins/smarty_internal_template.php
View File

@@ -42,7 +42,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
/**
* Source instance
*
* @var Smarty_Template_Source|Smarty_Template_Config
* @var \Smarty_Template_Source|\Smarty_Template_Config
*/
public $source = null;
@@ -223,6 +223,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
if (!empty($this->tpl_function)) {
$this->parent->tpl_function = array_merge($this->parent->tpl_function, $this->tpl_function);
}
/**
foreach ($this->compiled->required_plugins as $code => $tmp1) {
foreach ($tmp1 as $name => $tmp) {
foreach ($tmp as $type => $data) {
@@ -230,6 +231,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
}
}
}
* **/
}
if (!$no_output_filter &&
(!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled) &&
@@ -380,6 +382,41 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
}
}
/**
* Call plugin
*
* @param array $params parameter array
* @param string $type plugin type
* @param string $pluginName plugin name
*
* @return mixed
* @throws \SmartyException
*/
public function _executePlugin($params, $type, $pluginName, $content = null, &$repeat = null)
{
if (isset($this->smarty->_pluginCache[ $pluginName ][ $type ])) {
$callback = $this->smarty->_pluginCache[ $pluginName ][ $type ][0];
} else {
$pluginInfo = $this->smarty->_getPluginInfo($type, $pluginName);
if ($pluginInfo === false) {
throw new SmartyException("plugin '{$pluginName}' not callable");
}
$callback = $pluginInfo[0];
}
if ($type == Smarty::PLUGIN_MODIFIER) {
return call_user_func_array($callback, $params);
} else if ($type == Smarty::PLUGIN_BLOCK) {
if (!is_array($callback)) {
return $callback($params, $content, $this, $repeat);
} else if (is_object($callback[0])){
return $callback[0]->{$callback[1]}($params, $content, $this, $repeat);
} else {
return $callback[0]::{$callback[1]}($params, $content, $this, $repeat);
}
}
return call_user_func_array($callback, array($params, $this));
}
/**
* Check if parent is template object
*