Merge remote-tracking branch 'origin/master'

2013-09-26 20:47:38 +02:00 · 2013-09-26 20:47:38 +02:00 · 699d08efec
commit 699d08efec
parent 979b304900 6dadb93ad1
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -55,6 +55,7 @@ phpMyAdmin - ChangeLog
 - bug #4102 ALTER TABLE ORDER BY and InnoDB
 - bug #4103 Tracking report: cannot delete a statement
 - bug #3996 Drizzle navigation doesn't expand
+- bug #4074 GIS column editor: point not displayed

 4.0.7.0 (2013-09-23)
 - bug #3993 Sorting in database overview with statistics doesn't work
--- a/js/tbl_gis_visualization.js
+++ b/js/tbl_gis_visualization.js
@ -16,7 +16,7 @@ var defaultY = 0;
 // Variables
 var x;
 var y;
-var scale;
+var scale = 1;

 var svg;