summaryrefslogtreecommitdiff
path: root/app/Module/CensusAssistantModule.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2017-07-11 11:52:56 +0100
committerGreg Roach <fisharebest@gmail.com>2017-07-11 11:53:09 +0100
commitcc5ab399cc3c8f78158c8e3027cb0ecf038648dc (patch)
tree54da92556607e9cae21cfbd440ed136b383b0b94 /app/Module/CensusAssistantModule.php
parent1c2ce4bb435dee3d5672951797a6a66711c25938 (diff)
downloadwebtrees-cc5ab399cc3c8f78158c8e3027cb0ecf038648dc.tar.gz
webtrees-cc5ab399cc3c8f78158c8e3027cb0ecf038648dc.tar.bz2
webtrees-cc5ab399cc3c8f78158c8e3027cb0ecf038648dc.zip
Prepare to remove class Filter
Diffstat (limited to 'app/Module/CensusAssistantModule.php')
-rw-r--r--app/Module/CensusAssistantModule.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/Module/CensusAssistantModule.php b/app/Module/CensusAssistantModule.php
index 7814ff357d..6faf90acc6 100644
--- a/app/Module/CensusAssistantModule.php
+++ b/app/Module/CensusAssistantModule.php
@@ -386,7 +386,7 @@ class CensusAssistantModule extends AbstractModule {
echo '<td class="list_value_wrap"><ul>';
usort($myindilist, '\Fisharebest\Webtrees\GedcomRecord::compare');
foreach ($myindilist as $indi) {
- $nam = Filter::escapeHtml($indi->getFullName());
+ $nam = Html::escape($indi->getFullName());
echo "<li><a href=\"#\" onclick=\"pasterow(
'" . $indi->getXref() . "' ,
'" . $nam . "' ,
@@ -469,11 +469,11 @@ class CensusAssistantModule extends AbstractModule {
public static function formatCensusNote(Note $note) {
if (preg_match('/(.*)((?:\n.*)*)\n\.start_formatted_area\.\n(.+)\n(.+(?:\n.+)*)\n.end_formatted_area\.((?:\n.*)*)/', $note->getNote(), $match)) {
// This looks like a census-assistant shared note
- $title = Filter::escapeHtml($match[1]);
- $preamble = Filter::escapeHtml($match[2]);
- $header = Filter::escapeHtml($match[3]);
- $data = Filter::escapeHtml($match[4]);
- $postamble = Filter::escapeHtml($match[5]);
+ $title = Html::escape($match[1]);
+ $preamble = Html::escape($match[2]);
+ $header = Html::escape($match[3]);
+ $data = Html::escape($match[4]);
+ $postamble = Html::escape($match[5]);
// Get the column headers for the census to which this note refers
// requires the fact place & date to match the specific census