summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Functions/FunctionsPrint.php2
-rw-r--r--app/Place.php6
-rw-r--r--app/Stats.php8
-rw-r--r--resources/views/lists/families-table.phtml2
-rw-r--r--resources/views/lists/individuals-table.phtml4
-rw-r--r--resources/views/modules/pedigree-map/event-sidebar.phtml2
-rw-r--r--resources/views/modules/places/event-sidebar.phtml2
-rw-r--r--resources/views/modules/todays_events/list.phtml2
-rw-r--r--resources/views/modules/upcoming_events/list.phtml2
-rw-r--r--resources/views/place-hierarchy.phtml2
-rw-r--r--resources/views/place-list.phtml2
-rw-r--r--resources/views/place-sidebar.phtml2
-rw-r--r--resources/views/places-page.phtml2
13 files changed, 19 insertions, 19 deletions
diff --git a/app/Functions/FunctionsPrint.php b/app/Functions/FunctionsPrint.php
index de6d0d0592..60c28f6de7 100644
--- a/app/Functions/FunctionsPrint.php
+++ b/app/Functions/FunctionsPrint.php
@@ -380,7 +380,7 @@ class FunctionsPrint
if ($anchor) {
// Show the full place name, for facts/events tab
- $html = '<a href="' . $event->place()->getURL() . '">' . $event->place()->getFullName() . '</a>';
+ $html = '<a href="' . e($event->place()->url()) . '">' . $event->place()->getFullName() . '</a>';
} else {
// Abbreviate the place name, for chart boxes
return $event->place()->getShortName();
diff --git a/app/Place.php b/app/Place.php
index 2c28b6dc0b..1bed55db79 100644
--- a/app/Place.php
+++ b/app/Place.php
@@ -123,12 +123,12 @@ class Place
*
* @return string
*/
- public function getURL(): string
+ public function url(): string
{
- return e(route('place-hierarchy', [
+ return route('place-hierarchy', [
'parent' => array_reverse($this->gedcom_place),
'ged' => $this->tree->name(),
- ]));
+ ]);
}
/**
diff --git a/app/Stats.php b/app/Stats.php
index c34cc13f5c..1a1e1abb99 100644
--- a/app/Stats.php
+++ b/app/Stats.php
@@ -1849,7 +1849,7 @@ class Stats
$top10[] = '<li>';
foreach ($country as $country_name => $tot) {
$tmp = new Place($country_name, $this->tree);
- $place = '<a href="' . $tmp->getURL() . '" class="list_item">' . $all_countries[$country_code] . '</a>';
+ $place = '<a href="' . e($tmp->url()) . '" class="list_item">' . $all_countries[$country_code] . '</a>';
$top10[] .= $place . ' - ' . I18N::number($tot);
}
$top10[] .= '</li>';
@@ -1875,7 +1875,7 @@ class Stats
arsort($places);
foreach ($places as $place => $count) {
$tmp = new Place($place, $this->tree);
- $place = '<a href="' . $tmp->getURL() . '" class="list_item">' . $tmp->getFullName() . '</a>';
+ $place = '<a href="' . e($tmp->url()) . '" class="list_item">' . $tmp->getFullName() . '</a>';
$top10[] = '<li>' . $place . ' - ' . I18N::number($count) . '</li>';
if ($i++ == 10) {
break;
@@ -1899,7 +1899,7 @@ class Stats
arsort($places);
foreach ($places as $place => $count) {
$tmp = new Place($place, $this->tree);
- $place = '<a href="' . $tmp->getURL() . '" class="list_item">' . $tmp->getFullName() . '</a>';
+ $place = '<a href="' . e($tmp->url()) . '" class="list_item">' . $tmp->getFullName() . '</a>';
$top10[] = '<li>' . $place . ' - ' . I18N::number($count) . '</li>';
if ($i++ == 10) {
break;
@@ -1923,7 +1923,7 @@ class Stats
arsort($places);
foreach ($places as $place => $count) {
$tmp = new Place($place, $this->tree);
- $place = '<a href="' . $tmp->getURL() . '" class="list_item">' . $tmp->getFullName() . '</a>';
+ $place = '<a href="' . e($tmp->url()) . '" class="list_item">' . $tmp->getFullName() . '</a>';
$top10[] = '<li>' . $place . ' - ' . I18N::number($count) . '</li>';
if ($i++ == 10) {
break;
diff --git a/resources/views/lists/families-table.phtml b/resources/views/lists/families-table.phtml
index 4a4f6ab052..b0a54deb9a 100644
--- a/resources/views/lists/families-table.phtml
+++ b/resources/views/lists/families-table.phtml
@@ -321,7 +321,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
<!-- Marriage place -->
<td>
<?php foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) : ?>
- <a href="<?= $marriage_place->getURL() ?>" title="<?= strip_tags($marriage_place->getFullName()) ?>">
+ <a href="<?= e($marriage_place->url()) ?>" title="<?= strip_tags($marriage_place->getFullName()) ?>">
<?= $marriage_place->getShortName() ?>
</a>
<br>
diff --git a/resources/views/lists/individuals-table.phtml b/resources/views/lists/individuals-table.phtml
index df461b8408..ba59a82904 100644
--- a/resources/views/lists/individuals-table.phtml
+++ b/resources/views/lists/individuals-table.phtml
@@ -283,7 +283,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
<!-- Birth place -->
<td>
<?php foreach ($individual->getAllBirthPlaces() as $n => $birth_place) : ?>
- <a href="<?= $birth_place->getURL() ?>" title="<?= strip_tags($birth_place->getFullName()) ?>">
+ <a href="<?= e($birth_place->url()) ?>" title="<?= strip_tags($birth_place->getFullName()) ?>">
<?= $birth_place->getShortName() ?>
</a>
<br>
@@ -330,7 +330,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
<!-- Death place -->
<td>
<?php foreach ($individual->getAllDeathPlaces() as $n => $death_place) : ?>
- <a href="<?= $death_place->getURL() ?>" title="<?= e(strip_tags($death_place->getFullName())) ?>">
+ <a href="<?= e($death_place->url()) ?>" title="<?= e(strip_tags($death_place->getFullName())) ?>">
<?= $death_place->getShortName() ?>
</a>
<br>
diff --git a/resources/views/modules/pedigree-map/event-sidebar.phtml b/resources/views/modules/pedigree-map/event-sidebar.phtml
index 8b647768f1..df2f431386 100644
--- a/resources/views/modules/pedigree-map/event-sidebar.phtml
+++ b/resources/views/modules/pedigree-map/event-sidebar.phtml
@@ -24,7 +24,7 @@
<?php if (!$place->isEmpty()) : ?>
<div>
- <a href="<?= e($place->getUrl()) ?>">
+ <a href="<?= e($place->url()) ?>">
<?= $place->getFullName() ?>
</a>
</div>
diff --git a/resources/views/modules/places/event-sidebar.phtml b/resources/views/modules/places/event-sidebar.phtml
index 8b647768f1..df2f431386 100644
--- a/resources/views/modules/places/event-sidebar.phtml
+++ b/resources/views/modules/places/event-sidebar.phtml
@@ -24,7 +24,7 @@
<?php if (!$place->isEmpty()) : ?>
<div>
- <a href="<?= e($place->getUrl()) ?>">
+ <a href="<?= e($place->url()) ?>">
<?= $place->getFullName() ?>
</a>
</div>
diff --git a/resources/views/modules/todays_events/list.phtml b/resources/views/modules/todays_events/list.phtml
index 770f4f3d1b..a3796f2450 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="' . $fact->place()->getURL() . '">' . $fact->place()->getFullName() . '</a>'; ?>
+ <?= ' — <a href="' . e($fact->place()->url()) . '">' . $fact->place()->getFullName() . '</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 770f4f3d1b..a3796f2450 100644
--- a/resources/views/modules/upcoming_events/list.phtml
+++ b/resources/views/modules/upcoming_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="' . $fact->place()->getURL() . '">' . $fact->place()->getFullName() . '</a>'; ?>
+ <?= ' — <a href="' . e($fact->place()->url()) . '">' . $fact->place()->getFullName() . '</a>'; ?>
<?php endif ?>
</div>
<?php endforeach ?>
diff --git a/resources/views/place-hierarchy.phtml b/resources/views/place-hierarchy.phtml
index 15489351b5..d31579517f 100644
--- a/resources/views/place-hierarchy.phtml
+++ b/resources/views/place-hierarchy.phtml
@@ -12,7 +12,7 @@
<ul class="col list_value_wrap mr-1">
<?php foreach ($column as $item) : ?>
<li>
- <a href="<?= $item->getURL() ?>"><?= $item->getPlaceName() ?></a>
+ <a href="<?= e($item->url()) ?>"><?= $item->getPlaceName() ?></a>
</li>
<?php endforeach ?>
</ul>
diff --git a/resources/views/place-list.phtml b/resources/views/place-list.phtml
index 2d60ddad40..db19e64271 100644
--- a/resources/views/place-list.phtml
+++ b/resources/views/place-list.phtml
@@ -11,7 +11,7 @@
<ul class="col list_value_wrap mr-1">
<?php foreach ($column as $item) : ?>
<li>
- <a href="<?= $item->getURL() ?>"><?= $item->getReverseName() ?></a>
+ <a href="<?= e($item->url()) ?>"><?= $item->getReverseName() ?></a>
</li>
<?php endforeach ?>
</ul>
diff --git a/resources/views/place-sidebar.phtml b/resources/views/place-sidebar.phtml
index d2d37e9429..3f19222247 100644
--- a/resources/views/place-sidebar.phtml
+++ b/resources/views/place-sidebar.phtml
@@ -4,7 +4,7 @@
<div class="d-table-row">
<div class="d-table-cell label">
<?php if ($showlink) : ?>
- <a href="<?= $place->getURL() ?>">
+ <a href="<?= e($place->url()) ?>">
<?= $place->getPlaceName() ?>
</a>
<?php else : ?>
diff --git a/resources/views/places-page.phtml b/resources/views/places-page.phtml
index 24796556c8..95c6d4b8bf 100644
--- a/resources/views/places-page.phtml
+++ b/resources/views/places-page.phtml
@@ -14,7 +14,7 @@
<?php foreach ($breadcrumbs as $item) : ?>
-
- <a href="<?= $item->getURL() ?>" dir="auto"><?= $item->getPlaceName() ?></a>
+ <a href="<?= e($item->url()) ?>" dir="auto"><?= $item->getPlaceName() ?></a>
<?php endforeach ?>
<?php if ($current) : ?>
generated by cgit v1.3 (git 2.53.0) at 2026-07-05 15:46:38 +0000