diff options
| author | Greg Roach <fisharebest@gmail.com> | 2015-02-22 16:21:44 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2015-02-22 16:21:44 +0000 |
| commit | e6e10387f2d5e0dafec4db93266b02b74672a2a9 (patch) | |
| tree | 22b5bbcff81a44471559ce5fafd63122bd936a96 /modules_v3/googlemap | |
| parent | e9a947a1a53f6fa958653af35612048b8a9a9d3b (diff) | |
| download | webtrees-e6e10387f2d5e0dafec4db93266b02b74672a2a9.tar.gz webtrees-e6e10387f2d5e0dafec4db93266b02b74672a2a9.tar.bz2 webtrees-e6e10387f2d5e0dafec4db93266b02b74672a2a9.zip | |
Undefined function call in pedigree map
Diffstat (limited to 'modules_v3/googlemap')
| -rw-r--r-- | modules_v3/googlemap/module.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules_v3/googlemap/module.php b/modules_v3/googlemap/module.php index 4b75e8b99d..a7034d854a 100644 --- a/modules_v3/googlemap/module.php +++ b/modules_v3/googlemap/module.php @@ -745,7 +745,7 @@ class googlemap_WT_Module extends Module implements ModuleConfigInterface, Modul // End of internal configuration variables $controller - ->setPageTitle(/* I18N: %s is an individual’s name */ I18N::translate('Pedigree map of %s', $controller->getPersonName())) + ->setPageTitle(/* I18N: %s is an individual’s name */ I18N::translate('Pedigree map of %s', $controller->root->getFullName())) ->pageHeader() ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL) ->addInlineJavascript('autocomplete();'); @@ -824,7 +824,7 @@ class googlemap_WT_Module extends Module implements ModuleConfigInterface, Modul if ($latlongval[$i]) { $lat[$i] = str_replace(array('N', 'S', ','), array('', '-', '.'), $latlongval[$i]->pl_lati); $lon[$i] = str_replace(array('E', 'W', ','), array('', '-', '.'), $latlongval[$i]->pl_long); - if (($lat[$i] != null) && ($lon[$i] != null)) { + if ($lat[$i] && $lon[$i]) { $count++; } else { // The place is in the table but has empty values @@ -1881,7 +1881,7 @@ class googlemap_WT_Module extends Module implements ModuleConfigInterface, Modul /** * @param string $place * - * @return null|stdClass + * @return null|\stdClass */ private function getLatitudeAndLongitudeFromPlaceLocation($place) { $parent = explode(',', $place); |