diff options
Diffstat (limited to 'resources/views/modules')
5 files changed, 7 insertions, 7 deletions
diff --git a/resources/views/modules/pedigree-map/events.phtml b/resources/views/modules/pedigree-map/events.phtml index df2f431386..ae60f14c00 100644 --- a/resources/views/modules/pedigree-map/events.phtml +++ b/resources/views/modules/pedigree-map/events.phtml @@ -22,10 +22,10 @@ <?= $date ?> </div> -<?php if (!$place->isEmpty()) : ?> +<?php if ($place->gedcomName() !== '') : ?> <div> <a href="<?= e($place->url()) ?>"> - <?= $place->getFullName() ?> + <?= $place->fullName() ?> </a> </div> <?php endif ?> diff --git a/resources/views/modules/relatives/family.phtml b/resources/views/modules/relatives/family.phtml index a7dab7cada..72e119089d 100644 --- a/resources/views/modules/relatives/family.phtml +++ b/resources/views/modules/relatives/family.phtml @@ -107,7 +107,7 @@ <th scope="row"> </th> <td> - <?= GedcomTag::getLabelValue($fact->getTag(), $fact->date()->display() . ' — ' . $fact->place()->getFullName()) ?> + <?= GedcomTag::getLabelValue($fact->getTag(), $fact->date()->display() . ' — ' . $fact->place()->fullName()) ?> </td> </tr> diff --git a/resources/views/modules/timeline-chart/chart.phtml b/resources/views/modules/timeline-chart/chart.phtml index 3cc349edeb..629c01191a 100644 --- a/resources/views/modules/timeline-chart/chart.phtml +++ b/resources/views/modules/timeline-chart/chart.phtml @@ -356,7 +356,7 @@ } echo ' ' . e($desc); if (!$event->place()->isEmpty()) { - echo ' — ' . $event->place()->getShortName(); + echo ' — ' . $event->place()->shortName(); } // Print spouses names for family events if ($event->record() instanceof Family) { diff --git a/resources/views/modules/todays_events/list.phtml b/resources/views/modules/todays_events/list.phtml index a3796f2450..2926991a3e 100644 --- a/resources/views/modules/todays_events/list.phtml +++ b/resources/views/modules/todays_events/list.phtml @@ -13,7 +13,7 @@ <?= $fact->label() . ' — ' . $fact->date()->display(true); ?> <?= ' (' . I18N::timeAgo($fact->anniv * 365 * 24 * 60 * 60) . ')'; ?> <?php if (!$fact->place()->isEmpty()) : ?> - <?= ' — <a href="' . e($fact->place()->url()) . '">' . $fact->place()->getFullName() . '</a>'; ?> + <?= ' — <a href="' . e($fact->place()->url()) . '">' . $fact->place()->fullName() . '</a>'; ?> <?php endif ?> </div> <?php endforeach ?> diff --git a/resources/views/modules/upcoming_events/list.phtml b/resources/views/modules/upcoming_events/list.phtml index a3796f2450..c708ad8bab 100644 --- a/resources/views/modules/upcoming_events/list.phtml +++ b/resources/views/modules/upcoming_events/list.phtml @@ -12,8 +12,8 @@ <div class="indent"> <?= $fact->label() . ' — ' . $fact->date()->display(true); ?> <?= ' (' . I18N::timeAgo($fact->anniv * 365 * 24 * 60 * 60) . ')'; ?> - <?php if (!$fact->place()->isEmpty()) : ?> - <?= ' — <a href="' . e($fact->place()->url()) . '">' . $fact->place()->getFullName() . '</a>'; ?> + <?php if ($fact->place()->gedcomName() !== '') : ?> + — <?=$fact->place()->fullName(true); ?> <?php endif ?> </div> <?php endforeach ?> |