Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 04a72687f84760273382509e0cf2228522653efe https://github.com/phpmyadmin/phpmyadmin/commit/04a72687f84760273382509e0cf2... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M libraries/navigation/NavigationTree.php Log Message: ----------- Add missing escaping Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 07216c9b8ede19a0d9b248e75ac0421684a93953 https://github.com/phpmyadmin/phpmyadmin/commit/07216c9b8ede19a0d9b248e75ac0... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M libraries/Config.php Log Message: ----------- Ensure that connection collation contains no HTML There is currently no MySQL collation which would do that, but just to be safe. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 81e72439b6991be5b777d21893bdf89c1ef46b5f https://github.com/phpmyadmin/phpmyadmin/commit/81e72439b6991be5b777d21893bd... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M libraries/Config.php M libraries/navigation/NavigationTree.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dbd848d5952e...81e72439b699