Merge branch 'jloguercio-8149' into 1.10.x

9 years ago · d72f5df5c0
parent e7dac8bafc c046d3efbe
commit d72f5df5c0
1 changed files with 6 additions and 0 deletions
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@ -319,6 +319,12 @@ foreach ($configurationFiles as $file) {
 // if we use the non-javascript version (with the go button) we receive a post
 $user_language = '';
 $browser_language = '';
+
+// see #8149
+if (!empty($_SESSION['user_language_choice'])) {
+    $user_language = $_SESSION['user_language_choice'];
+}
+
 if (!empty($_GET['language'])) {
    $user_language = $_GET['language'];
 }