Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 57475371a5b515c83bfc1bb2efcdf3ddb14787ed https://github.com/phpmyadmin/phpmyadmin/commit/57475371a5b515c83bfc1bb2efcd... Author: Marc Delisle <marc@infomarc.info> Date: 2014-07-11 (Fri, 11 Jul 2014) Changed paths: M ChangeLog M libraries/structure.lib.php Log Message: ----------- bug #4486 [security] XSS injection due to unescaped table comment Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 10014d4dc596b9e3a491bf04f3e708cf1887d5e1 https://github.com/phpmyadmin/phpmyadmin/commit/10014d4dc596b9e3a491bf04f3e7... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-07-11 (Fri, 11 Jul 2014) Changed paths: M ChangeLog M libraries/rte/rte_list.lib.php Log Message: ----------- bug #4488 [security] XSS injection due to unescaped table name (triggers) Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: f9d9a8cf9c117d7d90c6e8cdc09a25e45eb604e6 https://github.com/phpmyadmin/phpmyadmin/commit/f9d9a8cf9c117d7d90c6e8cdc09a... Author: Marc Delisle <marc@infomarc.info> Date: 2014-07-17 (Thu, 17 Jul 2014) Changed paths: M ChangeLog M libraries/rte/rte_list.lib.php M libraries/structure.lib.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a6738b870bec...f9d9a8cf9c11