BUGFIX Fixed arguments in global _t() function, added check for $retu…

…rnValue fallback that its not the injection array as second parameter
silverstripe · May 1, 2012 · 431b958 · 431b958
1 parent 0597e91
commit 431b958
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/Core.php b/core/Core.php
@@ -386,8 +386,8 @@ function stripslashes_recursively(&$array) {
 /**
  * @see i18n::_t()
  */
-function _t($entity, $string = "", $context = "") {
-	return i18n::_t($entity, $string, $context);
+function _t($entity, $string = "", $context = "", $injection = "") {
+	return i18n::_t($entity, $string, $context, $injection);
 }
 
 /**

diff --git a/i18n/i18n.php b/i18n/i18n.php
@@ -1488,7 +1488,7 @@ static function _t($entity, $string = "", $context = "", $injection = "") {
 		$translatorsByPrio = self::$translators;
 		if(!$translatorsByPrio) $translatorsByPrio = self::get_translators();
 
-		$returnValue = $string; // Fall back to default string argument
+		$returnValue = (is_string($string)) ? $string : ''; // Fall back to default string argument
 
 		foreach($translatorsByPrio as $priority => $translators) {
 			foreach($translators as $name => $translator) {