Branch: refs/heads/MAINT_3_5_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 50d1a4884306ae6705f0bb665ba71da24089b6fe https://github.com/phpmyadmin/phpmyadmin/commit/50d1a4884306ae6705f0bb665ba7... Author: Rouslan Placella rouslan@placella.com Date: 2012-08-09 (Thu, 09 Aug 2012)

Changed paths: M libraries/rte/rte_triggers.lib.php

Log Message: ----------- Fix for trigger page vulnerability, see PMASA-2012-4

Commit: ee306681d0d5ac09b6fc62a7d573020af083e856 https://github.com/phpmyadmin/phpmyadmin/commit/ee306681d0d5ac09b6fc62a7d573... Author: Marc Delisle marc@infomarc.info Date: 2012-08-09 (Thu, 09 Aug 2012)

Changed paths: M js/db_structure.js M js/functions.js

Log Message: ----------- Fix for Empty and Drop vulnerabilities on db Structure and Operations, see PMASA-2012-4

Commit: dca22c5046aa16899042592b40a0af7b5c4f1fc7 https://github.com/phpmyadmin/phpmyadmin/commit/dca22c5046aa16899042592b40a0... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2012-08-10 (Fri, 10 Aug 2012)

Changed paths: M tbl_create.php

Log Message: ----------- [security] properly escape name of newly created table, see PMASA-2012-4

Commit: 1aec25f5f2163029da51da39a1d13dcb20fb00ea https://github.com/phpmyadmin/phpmyadmin/commit/1aec25f5f2163029da51da39a1d1... Author: Rouslan Placella rouslan@placella.com Date: 2012-08-10 (Fri, 10 Aug 2012)

Changed paths: M libraries/rte/rte_triggers.lib.php

Log Message: ----------- [security] properly escape query error message when creating new trigger, see PMASA-2012-4

Commit: d56335691cf1c1d8be3453904a885038da0a8c93 https://github.com/phpmyadmin/phpmyadmin/commit/d56335691cf1c1d8be3453904a88... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)

Changed paths: M js/tbl_gis_visualization.js

Log Message: ----------- [security] Properly escape content of tooltips in GIS visualization

Commit: d84b98d34012cc5986fe84f1871b0396990391ef https://github.com/phpmyadmin/phpmyadmin/commit/d84b98d34012cc5986fe84f1871b... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M js/db_structure.js

Log Message: ----------- Fix for Empty and Drop vulnerabilities on db Structure and Operations, see PMASA-2012-4

Commit: e094f34bed5ef3fd9a4a3cd08e01ff59a260c730 https://github.com/phpmyadmin/phpmyadmin/commit/e094f34bed5ef3fd9a4a3cd08e01... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M tbl_create.php

Log Message: ----------- [security] properly escape name of newly created table, see PMASA-2012-4

Commit: cc97d82fd15771dfee07445323db3473c2e2da60 https://github.com/phpmyadmin/phpmyadmin/commit/cc97d82fd15771dfee07445323db... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M ChangeLog M Documentation.html M README M libraries/Config.class.php

Log Message: ----------- 3.4.11.1 release

Commit: 46819b311ca25848d0ec4fe9425817b6f9277ec1 https://github.com/phpmyadmin/phpmyadmin/commit/46819b311ca25848d0ec4fe94258... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M js/db_structure.js M tbl_create.php

Log Message: ----------- Merge branch 'QA_3_4' into MAINT_3_5_2

Commit: 6f200703a3f9e16126822b6add2138f93cec2aac https://github.com/phpmyadmin/phpmyadmin/commit/6f200703a3f9e16126822b6add21... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M ChangeLog

Log Message: ----------- Fix merge conflicts

Commit: 6c73243bb01d3dee38d5670c10f9fb119b353dd1 https://github.com/phpmyadmin/phpmyadmin/commit/6c73243bb01d3dee38d5670c10f9... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M js/db_structure.js M js/functions.js M js/tbl_gis_visualization.js M libraries/rte/rte_triggers.lib.php

Log Message: ----------- Merge remote branch 'security/MAINT_3_5_2-security' into MAINT_3_5_2

Commit: 5289a032cec12ef9f840652a84efc0af7f6c9bbe https://github.com/phpmyadmin/phpmyadmin/commit/5289a032cec12ef9f840652a84ef... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M ChangeLog M Documentation.html M README M libraries/Config.class.php

Log Message: ----------- 3.5.2.2 release

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4b133e277f1e...5289a032cec1