Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b3dbec11072c92fe2b1fe9605ae9bb4c9e27657b https://github.com/phpmyadmin/phpmyadmin/commit/b3dbec11072c92fe2b1fe9605ae… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/Advisor.class.php Log Message: ----------- Advisor: Check for possibly undefined memory usage values Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 8838d586660cb36080372507c68c97b8ba21102c https://github.com/phpmyadmin/phpmyadmin/commit/8838d586660cb36080372507c68… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/Advisor.class.php Log Message: ----------- Advisor class: Drop unnecessary initialization Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 6743e78ea48d3b056e713e3437cd58d2f253e41c https://github.com/phpmyadmin/phpmyadmin/commit/6743e78ea48d3b056e713e3437c… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M import.php M libraries/bookmark.lib.php M libraries/sql.lib.php M test/libraries/PMA_bookmark_test.php Log Message: ----------- PMA_Bookmark_delete: Drop unnecessary $db param Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: ec5292fb313467a203b9da0e6d0f920d57dc8a70 https://github.com/phpmyadmin/phpmyadmin/commit/ec5292fb313467a203b9da0e6d0… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/Config.class.php Log Message: ----------- Config class: Drop dead initializations Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 5cab1dfbf2e1d9907c0b51cb4705423343a70e9e https://github.com/phpmyadmin/phpmyadmin/commit/5cab1dfbf2e1d9907c0b51cb470… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/SavedSearches.class.php Log Message: ----------- Add string check for json_decode in SavedSearches::setCriterias Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 69ddb299890f75879cbc0763f4d8b5220b782e90 https://github.com/phpmyadmin/phpmyadmin/commit/69ddb299890f75879cbc0763f4d… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/DBQbe.class.php M libraries/DbSearch.class.php M libraries/DisplayResults.class.php M libraries/build_html_for_db.lib.php M libraries/core.lib.php M libraries/gis/GIS_Linestring.class.php M libraries/gis/GIS_Multilinestring.class.php M libraries/gis/GIS_Multipoint.class.php M libraries/gis/GIS_Multipolygon.class.php M libraries/gis/GIS_Point.class.php M libraries/gis/GIS_Polygon.class.php Log Message: ----------- Code style fixes Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: d9bd81a2a199812b3743c567472e4ef34793f673 https://github.com/phpmyadmin/phpmyadmin/commit/d9bd81a2a199812b3743c567472… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/insert_edit.lib.php M libraries/plugins/export/ExportJson.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportPhparray.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportYaml.class.php M libraries/plugins/export/PMA_ExportPdf.class.php M libraries/pmd_common.php M libraries/relation.lib.php Log Message: ----------- Code style fixes Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 9207203a5663cf2aaab007b484e5c2e7bb6372f2 https://github.com/phpmyadmin/phpmyadmin/commit/9207203a5663cf2aaab007b484e… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/Scripts.class.php M libraries/TableSearch.class.php M libraries/replication_gui.lib.php M libraries/schema/Pdf_Relation_Schema.class.php M libraries/server_status.lib.php M libraries/sqlparser.lib.php M libraries/structure.lib.php M libraries/sysinfo.lib.php M libraries/tbl_columns_definition_form.lib.php M libraries/tbl_relation.lib.php Log Message: ----------- Code style fixes Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 7937cbde62f287edb22715d2c6124a4783ca51ef https://github.com/phpmyadmin/phpmyadmin/commit/7937cbde62f287edb22715d2c61… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/Table.class.php Log Message: ----------- Complete the fix for bug #4418 Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 389d26c8113d6c5a5f201782c063d5ab8233dc93 https://github.com/phpmyadmin/phpmyadmin/commit/389d26c8113d6c5a5f201782c06… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-19 (Mon, 19 May 2014) Log Message: ----------- Merge commit '9207203' Commit: 8e99c1159f02346e4d1907d79f41b99f125226ca https://github.com/phpmyadmin/phpmyadmin/commit/8e99c1159f02346e4d1907d79f4… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/Table.class.php Log Message: ----------- Merge branch 'QA_4_2' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/71fb5057a3fb...8e99c1159f02