Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dee50ad8d182c4e38270ed2f1f1ed4d0b8a88fe6 https://github.com/phpmyadmin/phpmyadmin/commit/dee50ad8d182c4e38270ed2f1f1e... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M ChangeLog M libraries/Error.php Log Message: ----------- Reference self as self not using class name Issue #13040 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: ce49be7e070a4e2caab33314703f6f95c3cb0492 https://github.com/phpmyadmin/phpmyadmin/commit/ce49be7e070a4e2caab33314703f... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M libraries/DatabaseInterface.php Log Message: ----------- Fix condition to activate tracker Invoking empty() on the result might work in most cases as false is empty and false is result from failure, but on the other side empty can be true for valid results as well. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: bb95ecf852013869e6ffb4fef3a9bbbeba0ffdeb https://github.com/phpmyadmin/phpmyadmin/commit/bb95ecf852013869e6ffb4fef3a9... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M libraries/dbi/DBIDummy.php M test/libraries/database_interface_test.php Log Message: ----------- Extend Dummy driver to be able to inject expected queries results Signed-off-by: Michal Čihař <michal@cihar.com> Commit: a72a048f1e22db9eaacf99c7c96ade5b0bde5c94 https://github.com/phpmyadmin/phpmyadmin/commit/a72a048f1e22db9eaacf99c7c96a... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M libraries/DatabaseInterface.php M test/classes/DatabaseInterfaceTest.php Log Message: ----------- Correctly handle case when CURRENT_USER() fails It's not likely, but the code path was obviously returning wrong value. Maybe it did happen in issue #13037 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 12f7f6a7858e3e6f4d0bfe7405beacbf5f711d86 https://github.com/phpmyadmin/phpmyadmin/commit/12f7f6a7858e3e6f4d0bfe7405be... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M ChangeLog M libraries/DatabaseInterface.php M libraries/Error.php M libraries/dbi/DBIDummy.php M test/classes/DatabaseInterfaceTest.php M test/libraries/database_interface_test.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4f4667b33692...12f7f6a7858e