diff options
| -rw-r--r-- | auto_prepend.php | 4 | ||||
| -rwxr-xr-x | tests/autoprepend.t | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/auto_prepend.php b/auto_prepend.php index ba42293..f4f0b1c 100644 --- a/auto_prepend.php +++ b/auto_prepend.php @@ -82,9 +82,7 @@ function T($label, $language = null, $values = null) if (is_array($language)) # Need to swap params? list($language, $values) = array($values, $language); - $result = $GLOBALS['it_text']->text($label, $language); - - return strpos($result, "{") === false ? $result : it_text::transmogrify($result, array_map(array("it_html", "Q"), (array)$values), $label, $GLOBALS['it_text']->allowedfuncs); + return is_array($values) ? $GLOBALS['it_text']->etext($label, array_map(array("it_html", "Q"), $values), $language) : $GLOBALS['it_text']->text($label, $language); } /** diff --git a/tests/autoprepend.t b/tests/autoprepend.t index 01da49e..bf40605 100755 --- a/tests/autoprepend.t +++ b/tests/autoprepend.t @@ -9,13 +9,13 @@ $GLOBALS['it_text']->statictext = array( is( T('foo'), - "bar ", + "bar {v1}", "simple T()" ); is( T('foo', 'en'), - "qux ", + "qux {v1}", "simple T() with language" ); |