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>

diff --git a/Koha/Plugins/Base.pm b/Koha/Plugins/Base.pm
index 55e1e7b..4aa8e94 100644 (file)
--- 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 05e7c5c..9c0fcad 100755 (executable)
--- 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 1c2d644..2599519 100755 (executable)
--- 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 5e991fc..0c827c0 100755 (executable)
--- 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,