From a43901717ea0d37b5e6a9d7c74f40f6a7d29c12a Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Wed, 19 Jun 2013 08:52:56 -0700 Subject: [PATCH] Bug 10494: remove spurious warnings from the KohaBranchName plugin The KohaBranchName plugin now returns an empty string if given a NULL (undefined) library code or a library code that is not present in the database (e.g., the '__ANY__' placeholder that purchase suggestions can use). To test: [1] Create a purchase suggestion, setting the library to 'Any'. Create a second one setting the library to a specific one. [2] Go to the suggestions overview page in the staff interface. When you do so, the Apache logs should contain a warning that looks like this: [Wed Jun 19 07:13:06 2013] [error] [client 192.168.1.10] [Wed Jun 19 07:13:06 2013] suggestion.pl: Use of uninitialized value in concatenation (.) or string at /home/koha/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt line 487., referer: http://koha-staff.metaquarry/cgi-bin/koha/acqui/acqui-home.pl [3] Apply the patch. [4] Refresh the suggestions overview page. This time, there should be no new warning logged. [5] Verify that the library names for the two pending suggestions created in step 1 are displayed correctly. Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Passes all tests and QA script. Also adds new tests! Note: For the test plan to work you have to add the suggestion from the intranet, as Any is not an available option in OPAC. Signed-off-by: Galen Charlton (cherry picked from commit ad2c1b3b8f20b3060c9a3a35c21a0757c685cbec) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 42d93d1e342d0f450fcbe80767be91a3bbba20ac) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 42d93d1e342d0f450fcbe80767be91a3bbba20ac) --- Koha/Template/Plugin/KohaBranchName.pm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Koha/Template/Plugin/KohaBranchName.pm b/Koha/Template/Plugin/KohaBranchName.pm index a39aba0df7..51d1a441d1 100644 --- a/Koha/Template/Plugin/KohaBranchName.pm +++ b/Koha/Template/Plugin/KohaBranchName.pm @@ -17,19 +17,17 @@ package Koha::Template::Plugin::KohaBranchName; # with Koha; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -use strict; -use warnings; +use Modern::Perl; use Template::Plugin::Filter; use base qw( Template::Plugin::Filter ); -use warnings; -use strict; use C4::Branch qw( GetBranchName );; sub filter { - my ($self,$branchcode) = @_; - return GetBranchName( $branchcode ); + my ($self, $branchcode) = @_; + my $name = GetBranchName( $branchcode ); + return defined($name) ? $name : ''; } 1; -- 2.39.5