Merge branch 'QA_4_5'

1 files changed, 7 insertions, 0 deletions

diff --git a/gis_data_editor.php b/gis_data_editor.php
index d38db8d319..7268724128 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -23,6 +23,10 @@ function escape($variable)
 
 require_once 'libraries/common.inc.php';
 
+if (! isset($_REQUEST['field'])) {
+    PMA\libraries\Util::checkParameters(array('field'));
+}
+
 // Get data if any posted
 $gis_data = array();
 if (PMA_isValid($_REQUEST['gis_data'], 'array')) {
@@ -180,6 +184,9 @@ if ($geom_type == 'GEOMETRYCOLLECTION') {
 }
 
 for ($a = 0; $a < $geom_count; $a++) {
+    if (! isset($gis_data[$a])) {
+        continue;
+    }
 
     if ($geom_type == 'GEOMETRYCOLLECTION') {
         echo '<br/><br/>';