diff options
Diffstat (limited to 'app/Place.php')
| -rw-r--r-- | app/Place.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/Place.php b/app/Place.php index 4d65c09aff..6da6d76dd4 100644 --- a/app/Place.php +++ b/app/Place.php @@ -134,7 +134,7 @@ class Place { public function getPlaceName() { $place = reset($this->gedcom_place); - return $place ? '<span dir="auto">' . Filter::escapeHtml($place) . '</span>' : I18N::translate('unknown'); + return $place ? '<span dir="auto">' . Html::escape($place) . '</span>' : I18N::translate('unknown'); } /** @@ -154,12 +154,12 @@ class Place { public function getFullName() { if (true) { // If a place hierarchy is a single entity - return '<span dir="auto">' . Filter::escapeHtml(implode(I18N::$list_separator, $this->gedcom_place)) . '</span>'; + return '<span dir="auto">' . Html::escape(implode(I18N::$list_separator, $this->gedcom_place)) . '</span>'; } else { // If a place hierarchy is a list of distinct items $tmp = []; foreach ($this->gedcom_place as $place) { - $tmp[] = '<span dir="auto">' . Filter::escapeHtml($place) . '</span>'; + $tmp[] = '<span dir="auto">' . Html::escape($place) . '</span>'; } return implode(I18N::$list_separator, $tmp); @@ -187,7 +187,7 @@ class Place { $short_name = implode(self::GEDCOM_SEPARATOR, array_slice($this->gedcom_place, 0, $SHOW_PEDIGREE_PLACES)); } // Add a tool-tip showing the full name - return '<span title="' . Filter::escapeHtml($this->getGedcomName()) . '" dir="auto">' . Filter::escapeHtml($short_name) . '</span>'; + return '<span title="' . Html::escape($this->getGedcomName()) . '" dir="auto">' . Html::escape($short_name) . '</span>'; } } @@ -199,7 +199,7 @@ class Place { public function getReverseName() { $tmp = []; foreach (array_reverse($this->gedcom_place) as $place) { - $tmp[] = '<span dir="auto">' . Filter::escapeHtml($place) . '</span>'; + $tmp[] = '<span dir="auto">' . Html::escape($place) . '</span>'; } return implode(I18N::$list_separator, $tmp); |