Merge remote-tracking branch 'origin/master'

2013-01-20 18:52:28 +01:00 · 2013-01-20 18:52:28 +01:00 · b6c034fe8c
commit b6c034fe8c
parent ae5316a5bd c8dfa6b2f7
1 changed files with 3 additions and 1 deletions
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@ -481,7 +481,9 @@ if ($token_mismatch) {
        /* Possible login form */
        'pma_servername', 'pma_username', 'pma_password',
        /* Needed to send the correct reply */
-        'ajax_request'
+        'ajax_request',
+        /* Permit to log out even if there is a token mismatch */
+        'old_usr'
    );
    /**
     * Allow changing themes in test/theme.php