smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-09-25 11:50:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed another edge case

Browse Source
This commit is contained in:
Simon Wisselink
2025-02-13 23:07:34 +01:00
parent 227859142a
commit a796aeb7b3
3 changed files with 64 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libs/sysplugins/smarty_internal_templatecompilerbase.php
View File

@@ -618,8 +618,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
if (!$this->smarty->security_policy || $this->smarty->security_policy->isTrustedPhpFunction($name, $this)) {
if (strcasecmp($name, 'isset') === 0 || strcasecmp($name, 'empty') === 0
|| strcasecmp($name, 'array') === 0
|| is_callable($name)
|| isset($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name])
|| (is_callable($name) && !isset($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name]))
) {
$func_name = smarty_strtolower_ascii($name);
@@ -651,9 +650,9 @@ abstract class Smarty_Internal_TemplateCompilerBase
}
if ($func_name === 'empty') {
return $func_name . '(' .
str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')';
str_replace("')->value", "',null,true,false)->value", $parameter[0]) . ')';
} else {
return $func_name . '(' . $parameter[ 0 ] . ')';
return $func_name . '(' . $parameter[0] . ')';
}
} else {
@@ -667,8 +666,17 @@ abstract class Smarty_Internal_TemplateCompilerBase
'a custom modifier.', E_USER_DEPRECATED);
}
if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name][0])
&& !is_string($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name][0])) {
return $name . '(' . implode(',', $parameter) . ')';
}
}
}
if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name])) {
if ($name === $this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name][0]) {
return $name . '(' . implode(',', $parameter) . ')';
}
return sprintf(
'call_user_func_array($_smarty_tpl->registered_plugins[ \'%s\' ][ %s ][ 0 ], array( %s ))',
Smarty::PLUGIN_MODIFIER,
@@ -676,13 +684,9 @@ abstract class Smarty_Internal_TemplateCompilerBase
implode(',', $parameter)
);
}
return $name . '(' . implode(',', $parameter) . ')';
}
} else {
$this->trigger_template_error("unknown function '{$name}'");
}
}
}
/**
* Determines whether the passed string represents a valid (PHP) variable.

16
tests/UnitTests/SmartyMethodsTests/RegisterModifier/RegisterModifierTest.php
View File

@@ -88,6 +88,22 @@ class RegisterModifierTest extends PHPUnit_Smarty
$this->smarty->unregisterPlugin(Smarty::PLUGIN_MODIFIER, 'testmodifier');
$this->assertTrue(isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK]['testmodifier']));
}
public function testRegisterNativePhpFuncAsString()
{
$this->smarty->registerPlugin(Smarty::PLUGIN_MODIFIER, 'strrev', 'strrev');
$this->smarty->assign('myVar', 'andersom');
$this->assertEquals('mosredna', $this->smarty->fetch('string:{strrev($myVar)}'));
}
public function testRegisterNativePhpFuncUnderDifferentName()
{
$this->smarty->registerPlugin(Smarty::PLUGIN_MODIFIER, 'k_xyz_a', 'strrev');
$this->smarty->assign('myVar', 'andersom');
$this->assertEquals('mosredna', $this->smarty->fetch('string:{k_xyz_a($myVar)}'));
}
}
function mymodifier($a, $b, $c)