Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 431847b39ea32cbd20a7e58117df5029540f0e3c https://github.com/phpmyadmin/phpmyadmin/commit/431847b39ea32cbd20a7e58117df... Author: Nisarg Jhaveri <nisargjhaveri@gmail.com> Date: 2015-05-15 (Fri, 15 May 2015) Changed paths: M libraries/config/FormDisplay.class.php M libraries/config/FormDisplay.tpl.php M prefs_forms.php M prefs_manage.php M setup/frames/config.inc.php M setup/frames/index.inc.php M setup/lib/form_processing.lib.php M test/classes/config/PMA_FormDisplay_test.php M test/libraries/PMA_FormDisplay_tpl_test.php M test/libraries/PMA_Form_Processing_test.php Log Message: ----------- Return HTML instead of echo-ing directly in FormDisplay Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com> Commit: 00f9899dd3031cac9598e806998bc011f9d6e931 https://github.com/phpmyadmin/phpmyadmin/commit/00f9899dd3031cac9598e806998b... Author: Marc Delisle <marc@infomarc.info> Date: 2015-05-14 (Thu, 14 May 2015) Changed paths: M libraries/config/FormDisplay.class.php M libraries/config/FormDisplay.tpl.php M prefs_forms.php M prefs_manage.php M setup/frames/config.inc.php M setup/frames/index.inc.php M setup/lib/form_processing.lib.php M test/classes/config/PMA_FormDisplay_test.php M test/libraries/PMA_FormDisplay_tpl_test.php M test/libraries/PMA_Form_Processing_test.php Log Message: ----------- Merge pull request #1674 from nisargjhaveri/form_dis Return HTML instead of echo-ing directly in FormDisplay Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f525c01b9fe4...00f9899dd303