Bug 23271: Replace search_limited with search_with_library_limits

[srvgit] / members / merge-patrons.pl

diff --git a/members/merge-patrons.pl b/members/merge-patrons.pl
index b55db88..ca03168 100755 (executable)
--- a/members/merge-patrons.pl
+++ b/members/merge-patrons.pl
@@ -26,14 +26,13 @@ use C4::Output;
 use C4::Context;
 use Koha::Patrons;
 
-my $cgi = new CGI;
+my $cgi = CGI->new;
 
 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {
         template_name   => "members/merge-patrons.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
     }
 );
@@ -48,16 +47,21 @@ if ( $action eq 'show' ) {
     my $keeper_id = $cgi->param('keeper');
     my $results;
 
-    try {
-        my $keeper = Koha::Patrons->find( $keeper_id );
-        $results = $keeper->merge_with( \@ids );
-        $template->param(
-            keeper  => $keeper,
-            results => $results
-        );
-    }
-    catch {
-        $template->param( error => $_ );
+    my $keeper = Koha::Patrons->find( $keeper_id );
+
+    if ( $keeper ) {
+        try {
+            $results = $keeper->merge_with( \@ids );
+            $template->param(
+                keeper  => $keeper,
+                results => $results
+            );
+        }
+        catch {
+            $template->param( error => $_ );
+        }
+    } else {
+        $template->param( error => 'INVALID_KEEPER' );
     }
 }