Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: cdcf74ab0bde94d9be5aa29169b2c8ed8141103d https://github.com/phpmyadmin/phpmyadmin/commit/cdcf74ab0bde94d9be5aa29169b2... Author: Michal Čihař <michal@cihar.com> Date: 2016-08-02 (Tue, 02 Aug 2016) Changed paths: M ChangeLog M user_password.php Log Message: ----------- Fixed password change on MariaDB without auth plugin Fixes #12424 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 38b73180fd33070f4e28a6baeb4d5dcc24870ad8 https://github.com/phpmyadmin/phpmyadmin/commit/38b73180fd33070f4e28a6baeb4d... Author: Michal Čihař <michal@cihar.com> Date: 2016-08-02 (Tue, 02 Aug 2016) Changed paths: M libraries/plugins/auth/AuthenticationCookie.php Log Message: ----------- Fix password change in cookie auth We can not set same cookie twice, so we have to avoid sending auth cookie when we're about to change the password. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 77d5a1e07cce7b4f5090f2dcdff0c2eb9405db4f https://github.com/phpmyadmin/phpmyadmin/commit/77d5a1e07cce7b4f5090f2dcdff0... Author: Michal Čihař <michal@cihar.com> Date: 2016-08-02 (Tue, 02 Aug 2016) Changed paths: M po/it.po M po/tr.po Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/aaf48b98fb43...77d5a1e07cce