Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9d6157fda758ea0605f50ac6f2bd2f8d72cf3603 https://github.com/phpmyadmin/phpmyadmin/commit/9d6157fda758ea0605f50ac6f2bd... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-16 (Thu, 16 Jun 2016) Changed paths: M gis_data_editor.php Log Message: ----------- Ensure we use escaped version of type Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 69cfcc6abd90073543ecaf15d3a48d0a9a251b55 https://github.com/phpmyadmin/phpmyadmin/commit/69cfcc6abd90073543ecaf15d3a4... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-16 (Thu, 16 Jun 2016) Changed paths: M libraries/gis/GISVisualization.php Log Message: ----------- Ensure width and height are integers Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 2f220218de8d91da1b033362b1b3a3e26968ad95 https://github.com/phpmyadmin/phpmyadmin/commit/2f220218de8d91da1b033362b1b3... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-16 (Thu, 16 Jun 2016) Changed paths: M gis_data_editor.php M libraries/gis/GISVisualization.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9348d0cb167a...2f220218de8d