Lines 25-30
use C4::AuthoritiesMarc;
Link Here
|
25 |
use C4::Koha; |
25 |
use C4::Koha; |
26 |
use C4::Biblio; |
26 |
use C4::Biblio; |
27 |
|
27 |
|
|
|
28 |
use Koha::Authority::MergeRequests; |
28 |
use Koha::Authority::Types; |
29 |
use Koha::Authority::Types; |
29 |
use Koha::MetadataRecord::Authority; |
30 |
use Koha::MetadataRecord::Authority; |
30 |
|
31 |
|
Lines 84-89
if ($merge) {
Link Here
|
84 |
|
85 |
|
85 |
# Delete the other record. Do not merge. It is unneeded and could under |
86 |
# Delete the other record. Do not merge. It is unneeded and could under |
86 |
# special circumstances have unwanted side-effects. |
87 |
# special circumstances have unwanted side-effects. |
|
|
88 |
# Remove older pending merge requests for $recordid2 to itself. The above merge did the job already or will do. (See bug 22437) |
89 |
my $condition = { authid => $recordid2, authid_new => [undef, 0, $recordid2], done => 0 }; |
90 |
Koha::Authority::MergeRequests->search($condition)->delete; |
87 |
DelAuthority({ authid => $recordid2, skip_merge => 1 }); |
91 |
DelAuthority({ authid => $recordid2, skip_merge => 1 }); |
88 |
|
92 |
|
89 |
# Parameters |
93 |
# Parameters |
90 |
- |
|
|