diff options
| author | Greg Roach <fisharebest@gmail.com> | 2015-02-22 17:40:53 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2015-02-22 17:40:53 +0000 |
| commit | a67fcf08e595140c2dc70243529ec5d81c93987c (patch) | |
| tree | 1dc1d8c6b776bc2a033bd8306844e07beb7deb98 /modules_v3/googlemap | |
| parent | 56af52f56f8c0feca4947ebb5d324ed5147f7655 (diff) | |
| download | webtrees-a67fcf08e595140c2dc70243529ec5d81c93987c.tar.gz webtrees-a67fcf08e595140c2dc70243529ec5d81c93987c.tar.bz2 webtrees-a67fcf08e595140c2dc70243529ec5d81c93987c.zip | |
Comparing nulls
Diffstat (limited to 'modules_v3/googlemap')
| -rw-r--r-- | modules_v3/googlemap/module.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/modules_v3/googlemap/module.php b/modules_v3/googlemap/module.php index b737c7c1db..aa1cb07df5 100644 --- a/modules_v3/googlemap/module.php +++ b/modules_v3/googlemap/module.php @@ -4454,16 +4454,17 @@ class googlemap_WT_Module extends Module implements ModuleConfigInterface, Modul } } else { $parent_id = $row->pl_id; - if ((isset($_POST['overwritedata'])) && ($i + 1 == count($parent))) { - Database::prepare("UPDATE `##placelocation` SET pl_lati=?, pl_long=?, pl_zoom=?, pl_icon=? WHERE pl_id=?") + if (Filter::post('overwritedata') && ($i + 1 == count($parent))) { + Database::prepare("UPDATE `##placelocation` SET pl_lati = ?, pl_long = ?, pl_zoom = ?, pl_icon = ? WHERE pl_id = ?") ->execute(array($place['lati'], $place['long'], $place['zoom'], $place['icon'], $parent_id)); } else { - if ((($row->pl_long == '0') || ($row->pl_long == null)) && (($row->pl_lati == '0') || ($row->pl_lati == null))) { - Database::prepare("UPDATE `##placelocation` SET pl_lati=?, pl_long=? WHERE pl_id=?") + // Update only if existing data is missing + if (!$row->pl_long && !$row->pl_lati) { + Database::prepare("UPDATE `##placelocation` SET pl_lati = ?, pl_long = ? WHERE pl_id = ?") ->execute(array($place['lati'], $place['long'], $parent_id)); } - if (empty($row->pl_icon) && !empty($place['icon'])) { - Database::prepare("UPDATE `##placelocation` SET pl_icon=? WHERE pl_id=?") + if (!$row->pl_icon && $place['icon']) { + Database::prepare("UPDATE `##placelocation` SET pl_icon = ? WHERE pl_id = ?") ->execute(array($place['icon'], $parent_id)); } } |