Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: c1a3f85fbd1a9569646e7cf1b791325ae82c7961 https://github.com/phpmyadmin/phpmyadmin/commit/c1a3f85fbd1a9569646e7cf1b791... 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

Commit: 304fb2b645b36a39e03b954fdbd567173ebe6448 https://github.com/phpmyadmin/phpmyadmin/commit/304fb2b645b36a39e03b954fdbd5... 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: 822ac52395442ac1472901e4a73b6f2cbcef39b7 https://github.com/phpmyadmin/phpmyadmin/commit/822ac52395442ac1472901e4a73b... Author: Marc Delisle marc@infomarc.info Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php

Log Message: ----------- 4.2.9.1 release

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

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

Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php M libraries/TableSearch.class.php M libraries/Util.class.php

Log Message: ----------- Merge branch 'MAINT_4_2_9' into STABLE

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d721815f0ec1...ea91261a6242