Fix switching language on first load

diff --git a/adminer/include/lang.inc.php b/adminer/include/lang.inc.php
index c3ac8a72cbf7f32194123142714c57aa2fb94292..bd1596698eaa52246dc936df989a315bea1f19a6 100644 (file)
--- a/adminer/include/lang.inc.php
+++ b/adminer/include/lang.inc.php
@@ -70,11 +70,11 @@ function lang($idf, $number = null) {
 }
 
 function switch_lang() {
-       global $LANG, $langs, $token;
+       global $LANG, $langs;
        echo "<form action='' method='post'>\n<div id='lang'>";
        echo lang('Language') . ": " . html_select("lang", $langs, $LANG, "this.form.submit();");
        echo " <input type='submit' value='" . lang('Use') . "' class='hidden'>\n";
-       echo "<input type='hidden' name='token' value='$token'>\n";
+       echo "<input type='hidden' name='token' value='$_SESSION[token]'>\n"; // $token may be empty in auth.inc.php
        echo "</div>\n</form>\n";
 }
 

diff --git a/changes.txt b/changes.txt
index e84cdf8cb37f88feed25f0fce05efc0490e34c31..221fd558d72bc67df2e1fef4fdb095d07ad47174 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 3.6.2-dev:
+Fix switching language on first load
 
 Adminer 3.6.1 (released 2012-09-17):
 Fix compiled version on PHP with multibyte support