diff options
| author | fisharebest <fisharebest@gmail.com> | 2013-09-06 17:06:09 +0100 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2013-09-06 17:06:09 +0100 |
| commit | 1a68476f3a49cb08e0d9e5251b6e90712eb376c8 (patch) | |
| tree | 7c1ab86cb4d13bc77d488322f993f779f2633b45 /library/WT/Controller | |
| parent | 24fccd5de2a960b7df3f96219636ceb0b0ac8159 (diff) | |
| download | webtrees-1a68476f3a49cb08e0d9e5251b6e90712eb376c8.tar.gz webtrees-1a68476f3a49cb08e0d9e5251b6e90712eb376c8.tar.bz2 webtrees-1a68476f3a49cb08e0d9e5251b6e90712eb376c8.zip | |
Use WT_Place objects for manipulating places
Diffstat (limited to 'library/WT/Controller')
| -rw-r--r-- | library/WT/Controller/Lifespan.php | 5 | ||||
| -rw-r--r-- | library/WT/Controller/Timeline.php | 16 |
2 files changed, 5 insertions, 16 deletions
diff --git a/library/WT/Controller/Lifespan.php b/library/WT/Controller/Lifespan.php index c4264caf7f..53d3fc8da0 100644 --- a/library/WT/Controller/Lifespan.php +++ b/library/WT/Controller/Lifespan.php @@ -428,12 +428,11 @@ class WT_Controller_Lifespan extends WT_Controller_Page { if ($fact=="EVEN") { $fact = $val->getAttribute('TYPE'); } - $place = $val->getPlace(); $trans = WT_Gedcom_Tag::getLabel($fact); if (isset($eventinformation[$evntwdth])) { - $eventinformation[$evntwdth] .= "<br>".$trans."<br>".strip_tags($date->Display(false, '', NULL, false))." ".$place; + $eventinformation[$evntwdth] .= '<br>' . $trans . '<br>' . strip_tags($date->Display(false, '', NULL, false)) . ' ' . $val->getPlace()->getFullName(); } else { - $eventinformation[$evntwdth]= $fact."-fact, ".$trans."<br>".strip_tags($date->Display(false, '', NULL, false))." ".$place; + $eventinformation[$evntwdth] = $fact . '-fact, ' . $trans . '<br>' . strip_tags($date->Display(false, '', NULL, false)) . ' ' . $val->getPlace()->getFullName(); } } } diff --git a/library/WT/Controller/Timeline.php b/library/WT/Controller/Timeline.php index 2206881c9d..eb6a64ba09 100644 --- a/library/WT/Controller/Timeline.php +++ b/library/WT/Controller/Timeline.php @@ -228,19 +228,9 @@ class WT_Controller_Timeline extends WT_Controller_Page { echo '<span class="age"> ', WT_I18N::translate('Age'), ' ', $ageh, '</span>'; } } - echo " ".WT_Filter::escapeHtml($desc); - if ($SHOW_PEDIGREE_PLACES>0) { - $place = $event->getPlace(); - if ($place!=null) { - if ($desc!=null) echo " - "; - $plevels = explode(',', $place); - for ($plevel=0; $plevel<$SHOW_PEDIGREE_PLACES; $plevel++) { - if (!empty($plevels[$plevel])) { - if ($plevel>0) echo ", "; - echo WT_Filter::escapeHtml($plevels[$plevel]); - } - } - } + echo ' ' . WT_Filter::escapeHtml($desc); + if (!$event->getPlace()->isEmpty()) { + echo ' — ' . $event->getPlace()->getShortName(); } //-- print spouse name for marriage events if (isset($event->spouse)) { |