Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1ae6275be73d65a393aaa6829d4a71e5a1bf0045 https://github.com/phpmyadmin/phpmyadmin/commit/1ae6275be73d65a393aaa6829d4a... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M ChangeLog M libraries/DbSearch.php M libraries/navigation/nodes/Node.php Log Message: ----------- Fix wrong parameter to escapeString These come from f14cffd Fixes #12786 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 168c20909b3d316e0ab8ca9f7b6beb021600c1b6 https://github.com/phpmyadmin/phpmyadmin/commit/168c20909b3d316e0ab8ca9f7b6b... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-07 (Wed, 07 Dec 2016) Changed paths: M ChangeLog M libraries/DbSearch.php M libraries/navigation/nodes/Node.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7d7ab37aad2f...168c20909b3d