From 2581e8bf3dba315e305d4eee3cdf231f69332096 Mon Sep 17 00:00:00 2001 From: David Kinzer Date: Fri, 8 Jan 2016 18:10:23 +0000 Subject: [PATCH] Fix error when wtk is "GEOMETRYCOLLECTION EMPTY". An exception is thrown by `geofield_get_values_from_geometry()` because `geofield_compute_values()` does not properly handle a case where `$wkt` has a value of "GEOMETRYCOLLECTION EMPTY". This commit fixes the issue by checking for that value and acting accordingly. --- geofield.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geofield.module b/geofield.module index 0dd1995..723f562 100644 --- a/geofield.module +++ b/geofield.module @@ -189,7 +189,7 @@ function geofield_compute_values(&$values, $master_column = 'wkt') { // Load up the geometry object from the master-column data if ($master_column == 'wkt') { $wkt = $values['wkt']; - if ($wkt) { + if ($wkt && $wkt !== 'GEOMETRYCOLLECTION EMPTY') { $geometry = geoPHP::load($wkt, 'wkt'); } } -- 1.9.1