X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=authorities%2Fmerge.pl;h=0799c26b0420c02434c4966eccc9f3de2e80f2c1;hb=d8721bbc3687b13cd95abdcb73b3b7f9576e8190;hp=5b8c4fb260c2c7bde87b7a6c45eab0f834f6e6fd;hpb=891307f29be27113475b1605a558799ab9874c01;p=srvgit

diff --git a/authorities/merge.pl b/authorities/merge.pl
index 5b8c4fb260..0799c26b04 100755
--- a/authorities/merge.pl
+++ b/authorities/merge.pl
@@ -19,17 +19,16 @@
 
 use Modern::Perl;
 use CGI qw ( -utf8 );
-use C4::Output;
-use C4::Auth;
-use C4::AuthoritiesMarc;
-use C4::Koha;
-use C4::Biblio;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
+use C4::AuthoritiesMarc qw( GetAuthority ModAuthority DelAuthority GetTagsLabels merge );
+use C4::Biblio qw( TransformHtmlToMarc );
 
 use Koha::Authority::MergeRequests;
 use Koha::Authority::Types;
 use Koha::MetadataRecord::Authority;
 
-my $input  = new CGI;
+my $input  = CGI->new;
 my @authid = $input->multi_param('authid');
 my $merge  = $input->param('merge');
 
@@ -40,7 +39,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "authorities/merge.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { editauthorities => 1 },
     }
 );
@@ -83,11 +81,7 @@ if ($merge) {
     my $MARCfrom = GetAuthority( $recordid2 );
     merge({ mergefrom => $recordid2, MARCfrom => $MARCfrom, mergeto => $recordid1, MARCto => $record });
 
-    # Delete the other record. Do not merge. It is unneeded and could under
-    # special circumstances have unwanted side-effects.
-    # Remove older pending merge requests for $recordid2 to itself. The above merge did the job already or will do. (See bug 22437)
-    my $condition = { authid => $recordid2, authid_new => [undef, 0, $recordid2], done => 0 };
-    Koha::Authority::MergeRequests->search($condition)->delete;
+    # Delete the other record. No need to merge.
     DelAuthority({ authid => $recordid2, skip_merge => 1 });
 
     # Parameters