Store lang in session too

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@276 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/lang.inc.php b/lang.inc.php
index cb6dcdebc2295bd721b4b774280004215b301150..b911470364b900cdb535d484133dbf031b878b0a 100644 (file)
--- a/lang.inc.php
+++ b/lang.inc.php
@@ -34,10 +34,13 @@ function switch_lang() {
 if (isset($_GET["lang"])) {
        setcookie("lang", $_GET["lang"], strtotime("+1 month"), preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]));
        $_COOKIE["lang"] = $_GET["lang"];
+       $_SESSION["lang"] = $_GET["lang"];
 }
 
-if (strlen($_COOKIE["lang"]) && isset($translations[$_COOKIE["lang"]])) {
+if (isset($translations[$_COOKIE["lang"]])) {
        $LANG = $_COOKIE["lang"];
+} elseif (isset($translations[$_SESSION["lang"]])) {
+       $LANG = $_SESSION["lang"];
 } else {
        $accept_language = array();
        preg_match_all('~([-a-z]+)(;q=([0-9.]+))?~', $_SERVER["HTTP_ACCEPT_LANGUAGE"], $matches, PREG_SET_ORDER);