Browse Source

Fixing autodetect see BT#9051

Julio Montoya 10 years ago
parent
commit
3246504684
1 changed files with 9 additions and 5 deletions
  1. 9 5
      custompages/language.php

+ 9 - 5
custompages/language.php

@@ -51,14 +51,18 @@ if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_
 if (isset($_REQUEST['lang']) && !empty($_REQUEST['lang']) && in_array($_REQUEST['lang'], $available_langs)) {
 	$lang_match = $chamilo_langs[$_REQUEST['lang']];
 }
+
 global $_configuration;
-$defaultLanguage = api_get_interface_language();
 if (isset($_configuration['auto_detect_language_custom_pages']) &&
     $_configuration['auto_detect_language_custom_pages'] == true
 ) {
-    $defaultLanguage = $lang_match;
+    // Auto detect
+    $_user['language'] = $lang_match;
+    $_SESSION['user_language_choice'] = $lang_match;
+} else {
+    // Chamilo default platform.
+    $defaultLanguage = api_get_interface_language();
+    $_user['language'] = $defaultLanguage;
+    $_SESSION['user_language_choice'] = $defaultLanguage;
 }
-$_user['language'] = $defaultLanguage;
-
-$_SESSION['user_language_choice'] = $lang_match;