Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 57475371a5b515c83bfc1bb2efcdf3ddb14787ed
https://github.com/phpmyadmin/phpmyadmin/commit/57475371a5b515c83bfc1bb2efc…
Author: Marc Delisle <marc(a)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(a)infomarc.info>
Commit: dbfc3acb1f0b6d65a461e31a7d9a630cfc3f8f36
https://github.com/phpmyadmin/phpmyadmin/commit/dbfc3acb1f0b6d65a461e31a7d9…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-07-17 (Thu, 17 Jul 2014)
Changed paths:
M ChangeLog
M libraries/structure.lib.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/3501486ec9ae...dbfc3acb1f0b