[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f2b068: Better fix for issue #14309

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f2b068e1d3316d2518edc2fd9017a277c99d18cf https://github.com/phpmyadmin/phpmyadmin/commit/f2b068e1d3316d2518edc2fd901… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2018-05-20 (Sun, 20 May 2018) Changed paths: M libraries/classes/Config/FormDisplayTemplate.php Log Message: ----------- Better fix for issue #14309 Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 83f433695b19b73202c0ae8f9c03937be5f5e409 https://github.com/phpmyadmin/phpmyadmin/commit/83f433695b19b73202c0ae8f9c0… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2018-05-20 (Sun, 20 May 2018) Changed paths: M libraries/classes/Config/FormDisplayTemplate.php Log Message: ----------- Merge branch 'QA_4_8' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/447f7ae3d123...83f433695b19 **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.