Attachment 94408 Details for Bug 23712 – Bug 23712: (QA follow-up) Silence two other warns too

[patch] Bug 23712: (QA follow-up) Silence two other warns too

Bug-23712-QA-follow-up-Silence-two-other-warns-too.patch (text/plain), 1.35 KB, created by Marcel de Rooy on 2019-10-18 12:36:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2019-10-18 12:36:43 UTC

Size: 1.35 KB

patch

obsolete

>From a58e7c703ba53731b3b2a3d12a8f96337ae57b17 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 18 Oct 2019 12:34:43 +0000
>Subject: [PATCH] Bug 23712: (QA follow-up) Silence two other warns too
>Content-Type: text/plain; charset=utf-8
>
>Caused by undefined method:
>Use of uninitialized value in concatenation (.) or string at /usr/share/koha/Koha/Illrequest.pm line 857.
>Use of uninitialized value in concatenation (.) or string at /usr/share/koha/Koha/Illrequest.pm line 859.
>
>Test plan:
>Run test again
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> Koha/Illrequest.pm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/Koha/Illrequest.pm b/Koha/Illrequest.pm
>index 4f9623a9f5..5e0a806f38 100644
>--- a/Koha/Illrequest.pm
>+++ b/Koha/Illrequest.pm
>@@ -854,9 +854,9 @@ sub expandTemplate {
>     my $backend_dir = $self->_config->backend_dir;
>     my $backend_tmpl = join "/", $backend_dir, $backend;
>     my $intra_tmpl =  join "/", $backend_tmpl, "intra-includes",
>-        $params->{method} . ".inc";
>+        ( $params->{method}//q{} ) . ".inc";
>     my $opac_tmpl =  join "/", $backend_tmpl, "opac-includes",
>-        $params->{method} . ".inc";
>+        ( $params->{method}//q{} ) . ".inc";
>     # Set files to load
>     $params->{template} = $intra_tmpl;
>     $params->{opac_template} = $opac_tmpl;
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 23712: 93376 | 93441 | 94407 | 94408