Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 72cc1f9f513cb7252e40e46ce74f5b8ce2449ffc https://github.com/phpmyadmin/phpmyadmin/commit/72cc1f9f513cb7252e40e46ce74f... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-06-15 (Mon, 15 Jun 2015) Changed paths: M js/config.js Log Message: ----------- bug #4958 Designer Javascript error with specially crafted table name Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: e3449c9372be31736c94ac1eb4ecbfe6404c7103 https://github.com/phpmyadmin/phpmyadmin/commit/e3449c9372be31736c94ac1eb4ec... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-06-15 (Mon, 15 Jun 2015) Changed paths: M ChangeLog M db_datadict.php M db_search.php M db_structure.php M js/sql.js M js/tbl_change.js M js/tbl_operations.js M libraries/DBQbe.class.php M libraries/Util.class.php M po/nb.po M po/sk.po M tbl_addfield.php M tbl_export.php M tbl_import.php M tbl_operations.php M tbl_relation.php M tbl_structure.php M tbl_zoom_select.php M test/classes/PMA_DBQbe_test.php M view_operations.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/84fa181135a8...e3449c9372be