Make the fix for #105 more elegant, using $template->parseArguments()

This commit is contained in:
Thomas Seven 2015-01-29 11:59:14 +01:00
parent 2b3d450849
commit 84b3031a44
2 changed files with 4 additions and 18 deletions

View File

@ -50,15 +50,8 @@ class IfHelper implements Helper
*/
public function execute(Template $template, Context $context, $args, $source)
{
if (is_numeric($args)) {
$tmp = $args;
} elseif(preg_match('/^\'.*\'$/', trim($args))) {
$tmp = preg_replace('/^\'(.*)\'$/', '$1', trim($args));
} elseif(preg_match('/^".*"$/', trim($args))) {
$tmp = preg_replace('/^"(.*)"$/', '$1', trim($args));
} else {
$tmp = $context->get($args);
}
$parsedArgs = $template->parseArguments($args);
$tmp = $context->get($parsedArgs[0]);
$context->push($context->last());
if ($tmp) {

View File

@ -50,15 +50,8 @@ class UnlessHelper implements Helper
*/
public function execute(Template $template, Context $context, $args, $source)
{
if (is_numeric($args)) {
$tmp = $args;
} elseif(preg_match('/^\'.*\'$/', trim($args))) {
$tmp = preg_replace('/^\'(.*)\'$/', '$1', trim($args));
} elseif(preg_match('/^".*"$/', trim($args))) {
$tmp = preg_replace('/^"(.*)"$/', '$1', trim($args));
} else {
$tmp = $context->get($args);
}
$parsedArgs = $template->parseArguments($args);
$tmp = $context->get($parsedArgs[0]);
$context->push($context->last());