Merge branch '5.4RC'5.4

1 files changed, 9 insertions, 5 deletions

diff --git a/include/language.php b/include/language.php
index 622b9614d..d291deb63 100644
--- a/include/language.php
+++ b/include/language.php
@@ -77,7 +77,7 @@ function get_best_language() {
 	if(! isset($preferred)) {
 
 		/*
-		 * We could find no perfect match for any of the preferred languages. 
+		 * We could find no perfect match for any of the preferred languages.
 		 * For cases where the preference is fr-fr and we have fr but *not* fr-fr
 		 * run the test again and only look for the language base
 		 * which should provide an interface they can sort of understand
@@ -262,11 +262,15 @@ function tt($singular, $plural, $count, $ctx = ''){
  * @return string
  */
 function ta($k){
+		$t = null;
 
-        $t = App::$strings[$k];
-        if (is_array($t))
-                $t = implode("/", $t);
-        return ($t == "" ? $k : $t);
+		if(isset(App::$strings[$k]))
+			$t = App::$strings[$k];
+
+		if (is_array($t))
+			$t = implode("/", $t);
+
+		return ($t == "" ? $k : $t);
 }
 
 /**