Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-09-09 16:52:21 +02:00
commit 35cc2bf793

View File

@ -380,10 +380,10 @@ if (PMA_checkPageValidity($_REQUEST['back'], $goto_whitelist)) {
* f.e. lang, server, collation_connection in PMA\libraries\Config
*/
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$token_mismatch = true;
$token_provided = false;
$token_mismatch = true;
$token_provided = false;
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
if (PMA_isValid($_POST['token'])) {
$token_provided = true;
$token_mismatch = ! hash_equals($_SESSION[' PMA_token '], $_POST['token']);