From 70498b1566118bfdf6c23f827845ad994fd1dc89 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 9 May 2016 15:03:12 +0100
Subject: [PATCH] Bug 16476: Do not call CGI->param in list context, some more

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 Koha/Plugins/Base.pm      | 2 +-
 opac/ilsdi.pl             | 4 ++--
 svc/members/search        | 2 +-
 svc/virtualshelves/search | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Koha/Plugins/Base.pm b/Koha/Plugins/Base.pm
index 55e1e7b5c6..4aa8e94a82 100644
--- a/Koha/Plugins/Base.pm
+++ b/Koha/Plugins/Base.pm
@@ -117,7 +117,7 @@ sub get_template {
 
     $template->param(
         CLASS       => $self->{'class'},
-        METHOD      => $self->{'cgi'}->param('method'),
+        METHOD      => scalar $self->{'cgi'}->param('method'),
         PLUGIN_PATH => $self->get_plugin_http_path(),
     );
 
diff --git a/opac/ilsdi.pl b/opac/ilsdi.pl
index 108acc38d9..8320495d5d 100755
--- a/opac/ilsdi.pl
+++ b/opac/ilsdi.pl
@@ -128,7 +128,7 @@ unless ( $cgi->param('service') ) {
 }
 
 # If user requested a service description, then display it
-if ( $cgi->param('service') eq "Describe" and any { $cgi->param('verb') eq $_ } @services ) {
+if ( scalar $cgi->param('service') eq "Describe" and any { scalar $cgi->param('verb') eq $_ } @services ) {
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {   template_name   => "ilsdi.tt",
             query           => $cgi,
@@ -137,7 +137,7 @@ if ( $cgi->param('service') eq "Describe" and any { $cgi->param('verb') eq $_ }
             debug           => 1,
         }
     );
-    $template->param( $cgi->param('verb') => 1 );
+    $template->param( scalar $cgi->param('verb') => 1 );
     output_html_with_http_headers $cgi, $cookie, $template->output;
     exit 0;
 }
diff --git a/svc/members/search b/svc/members/search
index 1c2d6449ca..2599519b7e 100755
--- a/svc/members/search
+++ b/svc/members/search
@@ -31,7 +31,7 @@ my $input = new CGI;
 exit unless $input->param('template_path');
 
 my ($template, $user, $cookie) = get_template_and_user({
-    template_name   => $input->param('template_path'),
+    template_name   => scalar $input->param('template_path'),
     query           => $input,
     type            => "intranet",
     authnotrequired => 0,
diff --git a/svc/virtualshelves/search b/svc/virtualshelves/search
index 5e991fc630..0c827c081b 100755
--- a/svc/virtualshelves/search
+++ b/svc/virtualshelves/search
@@ -13,7 +13,7 @@ my $input = new CGI;
 exit unless $input->param('template_path');
 
 my ($template, $user, $cookie) = get_template_and_user({
-    template_name   => $input->param('template_path'),
+    template_name   => scalar $input->param('template_path'),
     query           => $input,
     type            => "intranet",
     authnotrequired => 0,
-- 
2.39.5