Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6c9c0b5dbfdd97dd4ee7664df6dcc729ac20676c https://github.com/phpmyadmin/phpmyadmin/commit/6c9c0b5dbfdd97dd4ee7664df6dc... Author: Marc Delisle marc@infomarc.info Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths: M libraries/TableSearch.class.php M libraries/Util.class.php

Log Message: ----------- [security] XSS with malicious ENUM values

Signed-off-by: Marc Delisle marc@infomarc.info

Conflicts: libraries/Util.class.php

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 9cb2f3e29ea7854006b932cab1c2e45767b23f88 https://github.com/phpmyadmin/phpmyadmin/commit/9cb2f3e29ea7854006b932cab1c2... Author: Marc Delisle marc@infomarc.info Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths: M libraries/TableSearch.class.php

Log Message: ----------- Bug 4544: additional fix for 4.2.x

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: ebf59b62b8c547844cdb6eb736b819ab1ffd65a6 https://github.com/phpmyadmin/phpmyadmin/commit/ebf59b62b8c547844cdb6eb736b8... Author: Marc Delisle marc@infomarc.info Date: 2014-10-01 (Wed, 01 Oct 2014)

Log Message: ----------- Merge commit '9cb2f3e'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1814c53e5f13...ebf59b62b8c5