diff options
| author | fisharebest <fisharebest@gmail.com> | 2012-12-05 08:44:21 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2012-12-05 08:44:21 +0000 |
| commit | 59365b59d36e76a3999519f4945991f4f49017c8 (patch) | |
| tree | 371b116ce2c458a0e85d0f6a380fb170c0fed64e /modules_v3/googlemap/placehierarchy.php | |
| parent | 793747588001e02c16f42b5c1c7141667fed9e7a (diff) | |
| download | webtrees-59365b59d36e76a3999519f4945991f4f49017c8.tar.gz webtrees-59365b59d36e76a3999519f4945991f4f49017c8.tar.bz2 webtrees-59365b59d36e76a3999519f4945991f4f49017c8.zip | |
Remove unnecessary config options from Google Maps - GM_DISP_COUNT.
Diffstat (limited to 'modules_v3/googlemap/placehierarchy.php')
| -rw-r--r-- | modules_v3/googlemap/placehierarchy.php | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/modules_v3/googlemap/placehierarchy.php b/modules_v3/googlemap/placehierarchy.php index c38a179109..a43a01c311 100644 --- a/modules_v3/googlemap/placehierarchy.php +++ b/modules_v3/googlemap/placehierarchy.php @@ -306,7 +306,7 @@ function print_how_many_people($level, $parent) { } function print_gm_markers($place2, $level, $parent, $levelm, $linklevels, $placelevels, $lastlevel=false) { - global $GOOGLEMAP_COORD, $GOOGLEMAP_PH_MARKER, $GM_DISP_SHORT_PLACE, $GM_DISP_COUNT; + global $GOOGLEMAP_COORD, $GOOGLEMAP_PH_MARKER, $GM_DISP_SHORT_PLACE; if (($place2['lati'] == NULL) || ($place2['long'] == NULL) || (($place2['lati'] == '0') && ($place2['long'] == '0'))) { echo 'var icon_type = new google.maps.MarkerImage();'; @@ -357,13 +357,11 @@ function print_gm_markers($place2, $level, $parent, $levelm, $linklevels, $place } } echo '</a>'; - if ($GM_DISP_COUNT) { - if ($lastlevel) { - print_how_many_people($level, $parent); - } else { - $parent[$level]=$place2['place']; - print_how_many_people($level+1, $parent); - } + if ($lastlevel) { + print_how_many_people($level, $parent); + } else { + $parent[$level]=$place2['place']; + print_how_many_people($level+1, $parent); } echo '<br>', WT_I18N::translate('This place has no coordinates'); if (WT_USER_IS_ADMIN) @@ -440,13 +438,11 @@ function print_gm_markers($place2, $level, $parent, $levelm, $linklevels, $place } } echo '</a>'; - if ($GM_DISP_COUNT) { - if ($lastlevel) { - print_how_many_people($level, $parent); - } else { - $parent[$level]=$place2['place']; - print_how_many_people($level+1, $parent); - } + if ($lastlevel) { + print_how_many_people($level, $parent); + } else { + $parent[$level]=$place2['place']; + print_how_many_people($level+1, $parent); } $temp=addslashes($place2['place']); $temp=str_replace(array('‎', '‏'), array(WT_UTF8_LRM, WT_UTF8_RLM), $temp); |