diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2020-06-27 20:37:45 +0100 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2020-06-27 20:42:40 +0100 |
| commit | 02467d3222d9362e48b39bb9221b32134076ae9c (patch) | |
| tree | f0e2305c7cfbb42b1aa91d92bb53d4bee83a7fa4 /app/Http/RequestHandlers/MergeRecordsAction.php | |
| parent | 669e70942469bf818386b44bab0ce4d237caba74 (diff) | |
| download | webtrees-02467d3222d9362e48b39bb9221b32134076ae9c.tar.gz webtrees-02467d3222d9362e48b39bb9221b32134076ae9c.tar.bz2 webtrees-02467d3222d9362e48b39bb9221b32134076ae9c.zip | |
Better handling for custom record types
Diffstat (limited to 'app/Http/RequestHandlers/MergeRecordsAction.php')
| -rw-r--r-- | app/Http/RequestHandlers/MergeRecordsAction.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Http/RequestHandlers/MergeRecordsAction.php b/app/Http/RequestHandlers/MergeRecordsAction.php index 10ac6283fd..c6d796d59d 100644 --- a/app/Http/RequestHandlers/MergeRecordsAction.php +++ b/app/Http/RequestHandlers/MergeRecordsAction.php @@ -57,7 +57,7 @@ class MergeRecordsAction implements RequestHandlerInterface $record1 === null || $record2 === null || $record1 === $record2 || - $record1::RECORD_TYPE !== $record2::RECORD_TYPE || + $record1->tag() !== $record2->tag() || $record1->isPendingDeletion() || $record2->isPendingDeletion() ) { |