Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: cde775bd2b7b3d56ba7cd608bad870feba75432f https://github.com/phpmyadmin/phpmyadmin/commit/cde775bd2b7b3d56ba7cd608bad8... Author: Harro Verton wanwizard@wanwizard.eu Date: 2017-04-28 (Fri, 28 Apr 2017)

Changed paths: M libraries/plugins/AuthenticationPlugin.php

Log Message: ----------- Don't destroy the session if logins are still present. fixes #12301

If you are logged-in into multiple database servers, logOut() logs you out of all of them. This fix will prevent that, and will only destroy the session when you log out of the last server.

Signed-off-by: Michal Čihař michal@cihar.com Signed-off-by: Harro Verton wanwizard@wanwizard.eu

Commit: 8d6b1dce57b4f5304346c15a851ae6f24823d3c7 https://github.com/phpmyadmin/phpmyadmin/commit/8d6b1dce57b4f5304346c15a851a... Author: Michal Čihař michal@cihar.com Date: 2017-04-28 (Fri, 28 Apr 2017)

Changed paths: M ChangeLog M index.php M libraries/plugins/AuthenticationPlugin.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/classes/plugin/auth/AuthenticationHttpTest.php

Log Message: ----------- Improved handling of logout with disabled LoginCookieDeleteAll

- avoid removing session for cookie auth if LoginCookieDeleteAll is disabled - redirect user to other server rather than to login page - show message about partial logout - adjust tests - this is based on #13221

Fixes #12301

Signed-off-by: Michal Čihař michal@cihar.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6e27bc61efca...8d6b1dce57b4