From b1fbb2e8e435a2b2ff13ca76db4013ca030f396c Mon Sep 17 00:00:00 2001
From: Romain d'Alverny <rda@mageia.org>
Date: Fri, 10 Jun 2011 17:45:21 +0000
Subject: fallback lang may not be supported yet - distinct def

---
 langs.inc.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'langs.inc.php')

diff --git a/langs.inc.php b/langs.inc.php
index 647f4011c..78e0deab5 100644
--- a/langs.inc.php
+++ b/langs.inc.php
@@ -145,12 +145,18 @@ class i18n
         if (in_array($lang, $known_langs)) {
             $ret = $lang;
         }
-        elseif (is_string($fallback_rules)) {
-            $ret = $fallback_rules;
-        }
-        elseif (is_array($fallback_rules)
-            && array_key_exists($lang, $fallback_rules)) {
-            $ret = $fallback_rules[$lang];
+        else {
+            if (is_string($fallback_rules)) {
+                $ret = $fallback_rules;
+            }
+            elseif (is_array($fallback_rules)
+                && array_key_exists($lang, $fallback_rules)) {
+
+                $ret = $fallback_rules[$lang];
+            }
+
+            if (!in_array($ret, $known_langs))
+                $ret = 'en';
         }
 
         return $ret;
-- 
cgit v1.2.1