Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: df29d8ae4100841ecdb59fdfdd29b76f9a28661d https://github.com/phpmyadmin/phpmyadmin/commit/df29d8ae4100841ecdb59fdfdd29... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M libraries/navigation/nodes/Node.php Log Message: ----------- Add appr. escaping for $cfg options 'hide_db' and 'only_db' These can lead to SQL injection. Fix #12497 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 27d0483192a7f9f483db5a7a2bda8f63336759b0 https://github.com/phpmyadmin/phpmyadmin/commit/27d0483192a7f9f483db5a7a2bda... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M libraries/navigation/nodes/Node.php Log Message: ----------- Merge branch 'QA_4_6' Commit: d0b8281e84f30d0c1a5a48b73752e8b1bce29b1a https://github.com/phpmyadmin/phpmyadmin/commit/d0b8281e84f30d0c1a5a48b73752... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12497 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: d5c3302fb403e4f27f399d9c41bb2416161fe313 https://github.com/phpmyadmin/phpmyadmin/commit/d5c3302fb403e4f27f399d9c41bb... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-08-25 (Thu, 25 Aug 2016) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/87f4e954d174...d5c3302fb403