summaryrefslogtreecommitdiff
path: root/app/Report
diff options
context:
space:
mode:
authorGreg Roach <greg@subaqua.co.uk>2021-06-25 11:34:02 +0100
committerGreg Roach <greg@subaqua.co.uk>2021-06-25 13:06:45 +0100
commitd0889c636ab33113e71c9804803ddb055453ed50 (patch)
treea904a59e72ca2275b2a73fd3c1d0fe36517e2b5b /app/Report
parent4a329a6c01c20d02be68ca91d0a95e583f97cbe1 (diff)
downloadwebtrees-d0889c636ab33113e71c9804803ddb055453ed50.tar.gz
webtrees-d0889c636ab33113e71c9804803ddb055453ed50.tar.bz2
webtrees-d0889c636ab33113e71c9804803ddb055453ed50.zip
Remove deprecated function Fact::getTag()
Diffstat (limited to 'app/Report')
-rw-r--r--app/Report/ReportParserGenerate.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/Report/ReportParserGenerate.php b/app/Report/ReportParserGenerate.php
index 49e5a4b283..86544dfc77 100644
--- a/app/Report/ReportParserGenerate.php
+++ b/app/Report/ReportParserGenerate.php
@@ -23,7 +23,6 @@ use DomainException;
use Fisharebest\Webtrees\Auth;
use Fisharebest\Webtrees\Carbon;
use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Registry;
use Fisharebest\Webtrees\Family;
use Fisharebest\Webtrees\Filter;
use Fisharebest\Webtrees\Functions\Functions;
@@ -36,6 +35,7 @@ use Fisharebest\Webtrees\Log;
use Fisharebest\Webtrees\MediaFile;
use Fisharebest\Webtrees\Note;
use Fisharebest\Webtrees\Place;
+use Fisharebest\Webtrees\Registry;
use Fisharebest\Webtrees\Tree;
use Illuminate\Database\Capsule\Manager as DB;
use Illuminate\Database\Query\Builder;
@@ -1308,13 +1308,15 @@ class ReportParserGenerate extends ReportParserBase
$this->repeats = [];
$nonfacts = explode(',', $tag);
foreach ($facts as $fact) {
- if (!in_array($fact->getTag(), $nonfacts, true)) {
+ $tag = explode(':', $fact->tag())[1];
+
+ if (!in_array($tag, $nonfacts, true)) {
$this->repeats[] = $fact->gedcom();
}
}
} else {
foreach ($record->facts() as $fact) {
- if (($fact->isPendingAddition() || $fact->isPendingDeletion()) && $fact->getTag() !== 'CHAN') {
+ if (($fact->isPendingAddition() || $fact->isPendingDeletion()) && !str_ends_with($fact->tag(), ':CHAN')) {
$this->repeats[] = $fact->gedcom();
}
}