Fix for substitutions passed in via twig function (they need to be in an array) - #574

This commit is contained in:
Andy Miller
2016-05-08 22:18:22 -06:00
parent 9c3a7257ee
commit fe5c2eecf9
2 changed files with 19 additions and 8 deletions

View File

@@ -45,8 +45,19 @@ class AdminTwigExtension extends \Twig_Extension
];
}
public function tuFilter($args, $lang = null)
public function tuFilter()
{
$args = func_get_args();
$numargs = count($args);
$lang = null;
if (($numargs == 3 && is_array($args[1])) || ($numargs == 2 && !is_array($args[1]))) {
$lang = array_pop($args);
} elseif ($numargs == 2 && is_array($args[1])) {
$subs = array_pop($args);
$args = array_merge($args, $subs);
}
return $this->grav['admin']->translate($args, $lang);
}