webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Michal Čihař
2016-08-02 08:43:22 +02:00
parent afcec9d9d7 38b73180fd
commit 696eeb463d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/plugins/auth/AuthenticationCookie.php
View File

@@ -471,7 +471,11 @@ class AuthenticationCookie extends AuthenticationPlugin
$this->storeUsernameCookie($cfg['Server']['user']);
// Duration = as configured
$this->storePasswordCookie($cfg['Server']['password']);
// Do not store password cookie on password change as we will
// set the cookie again after password has been changed
if (! isset($_POST['change_pw'])) {
$this->storePasswordCookie($cfg['Server']['password']);
}
// Set server cookies if required (once per session) and, in this case,
// force reload to ensure the client accepts cookies