From a8cc3b3db5b8599a5975da0ebef8e2f6236c0a9d Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 8 Feb 2024 09:56:39 +0100
Subject: [PATCH] Bug 34478: Add 'op' to authorities/merge

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 authorities/merge.pl                                      | 4 ++--
 .../intranet-tmpl/prog/en/modules/authorities/merge.tt    | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/authorities/merge.pl b/authorities/merge.pl
index 0799c26b04..2c82340468 100755
--- a/authorities/merge.pl
+++ b/authorities/merge.pl
@@ -30,7 +30,7 @@ use Koha::MetadataRecord::Authority;
 
 my $input  = CGI->new;
 my @authid = $input->multi_param('authid');
-my $merge  = $input->param('merge');
+my $op     = $input->param('op') || q{};
 
 my @errors;
 
@@ -46,7 +46,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 #------------------------
 # Merging
 #------------------------
-if ($merge) {
+if ($op eq 'cud-merge') {
 
     # Creating a new record from the html code
     my $record   = TransformHtmlToMarc($input, 0);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
index 531852e3ae..5c577c7556 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
@@ -68,8 +68,7 @@ div#result { margin-top: 1em; }
 [% ELSIF ( choosereference ) %]
 
 <p>Please choose which record will be the reference for the merge. The record chosen as reference will be kept, and the other will be deleted.</p>
-<form id="mergeform" action="/cgi-bin/koha/authorities/merge.pl" method="post">
-    [% INCLUDE 'csrf-token.inc' %]
+<form id="mergeform_ref" action="/cgi-bin/koha/authorities/merge.pl" method="get">
     <fieldset class="rows">
     <legend>Merge reference</legend>
     <ol>
@@ -119,7 +118,10 @@ div#result { margin-top: 1em; }
 <input type="hidden" name="mergereference" value="[% mergereference | html %]" />
 <input type="hidden" name="frameworkcode" value="[% framework | html %]" />
 
-<fieldset class="action"><input type="submit" name="merge" class="btn btn-primary" value="Merge" /></fieldset>
+<fieldset class="action">
+    <input type="hidden" name="op" value="cud-merge" />
+    <input type="submit" class="btn btn-primary" value="Merge" />
+</fieldset>
 </form>
 
 [% END %]
-- 
2.39.5