|
|
|
@ -412,8 +412,9 @@ class SubLanguageManager |
|
|
|
// select language - if case several languages match, get the last (more recent) one |
|
|
|
// select language - if case several languages match, get the last (more recent) one |
|
|
|
$sql = "SELECT english_name |
|
|
|
$sql = "SELECT english_name |
|
|
|
FROM " . $adminLanguagesTable . " |
|
|
|
FROM " . $adminLanguagesTable . " |
|
|
|
WHERE isocode ='$isocode' |
|
|
|
WHERE |
|
|
|
AND available = 1 |
|
|
|
isocode ='$isocode' AND |
|
|
|
|
|
|
|
available = 1 |
|
|
|
ORDER BY id |
|
|
|
ORDER BY id |
|
|
|
DESC LIMIT 1"; |
|
|
|
DESC LIMIT 1"; |
|
|
|
$res = Database::query($sql); |
|
|
|
$res = Database::query($sql); |
|
|
|
@ -434,7 +435,9 @@ class SubLanguageManager |
|
|
|
if (empty($preferences)) { |
|
|
|
if (empty($preferences)) { |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$preferencesArray = explode(',', $preferences); |
|
|
|
$preferencesArray = explode(',', $preferences); |
|
|
|
|
|
|
|
|
|
|
|
if (count($preferencesArray) > 0) { |
|
|
|
if (count($preferencesArray) > 0) { |
|
|
|
foreach ($preferencesArray as $pref) { |
|
|
|
foreach ($preferencesArray as $pref) { |
|
|
|
$s = strpos($pref, ';'); |
|
|
|
$s = strpos($pref, ';'); |
|
|
|
@ -444,6 +447,7 @@ class SubLanguageManager |
|
|
|
$code = $pref; |
|
|
|
$code = $pref; |
|
|
|
} |
|
|
|
} |
|
|
|
$name = self::getLanguageFromIsocode($code); |
|
|
|
$name = self::getLanguageFromIsocode($code); |
|
|
|
|
|
|
|
|
|
|
|
if ($name !== false) { |
|
|
|
if ($name !== false) { |
|
|
|
return $name; |
|
|
|
return $name; |
|
|
|
} |
|
|
|
} |
|
|
|
|