Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5022ff95603d3b3969ac222477641bf051c3d389 https://github.com/phpmyadmin/phpmyadmin/commit/5022ff95603d3b3969ac22247764... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-02 (Thu, 02 Feb 2017) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.php Log Message: ----------- Do not show errors from OpenSSL cookie encryption/decryption This can happen from corrupted cookies, by invalid encryption parameters used in older phpMyAdmin versions or by wrong openSSL configuration. In neither case the error is useful to user, but we need to clear the error buffer as otherwise the errors would pop up later, for example during MySQL SSL setup. Fixes #12924 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 2423aac692c273e9fa7f2ea096b6fdbe429978d7 https://github.com/phpmyadmin/phpmyadmin/commit/2423aac692c273e9fa7f2ea096b6... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-02 (Thu, 02 Feb 2017) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b55ff27f161e...2423aac692c2