Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cb3f2632a968826a0207daa0718573fb01f24c14 https://github.com/phpmyadmin/phpmyadmin/commit/cb3f2632a968826a0207daa07185... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/session.inc.php Log Message: ----------- Properly escape session startup errors Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 2251ca21c0c538e4f24bda47be02179845fa0b8a https://github.com/phpmyadmin/phpmyadmin/commit/2251ca21c0c538e4f24bda47be02... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/session.inc.php Log Message: ----------- Fix regexp for file path cleanup Signed-off-by: Michal Čihař <michal@cihar.com> Commit: eb3e3b73c34d7b6916a541f8eae08167b49ae455 https://github.com/phpmyadmin/phpmyadmin/commit/eb3e3b73c34d7b6916a541f8eae0... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/Error.php M libraries/ErrorHandler.php Log Message: ----------- Simplified handling of connection errors There is no need to retrigger errors, just let the handler know to handle them without backtrace. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 829d51c9dd34f53e90a8f4ec0afc9e985844556c https://github.com/phpmyadmin/phpmyadmin/commit/829d51c9dd34f53e90a8f4ec0afc... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/Error.php Log Message: ----------- Treat hide_location error as user ones Signed-off-by: Michal Čihař <michal@cihar.com> Commit: bfd6a76819ca0736b85376c76f01c6054875939c https://github.com/phpmyadmin/phpmyadmin/commit/bfd6a76819ca0736b85376c76f01... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/Error.php M libraries/ErrorHandler.php M libraries/session.inc.php Log Message: ----------- Merge branch 'QA_4_6' Commit: e01f40480445d56bc7ae4572f50d9dbba5f28546 https://github.com/phpmyadmin/phpmyadmin/commit/e01f40480445d56bc7ae4572f50d... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/DatabaseInterface.php Log Message: ----------- Remove unused variable Signed-off-by: Michal Čihař <michal@cihar.com> Commit: aee8184fafc3fe05d9ce788aafaefc912a0e68d4 https://github.com/phpmyadmin/phpmyadmin/commit/aee8184fafc3fe05d9ce788aafae... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/DatabaseInterface.php Log Message: ----------- Merge branch 'QA_4_6' Commit: 4e36c5bd0c42ea7ba58024b989db5d2e7ebe18ee https://github.com/phpmyadmin/phpmyadmin/commit/4e36c5bd0c42ea7ba58024b989db... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-02 (Fri, 02 Sep 2016) Changed paths: M libraries/core.lib.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4305f6e5030d...4e36c5bd0c42