From 11db96d435593eccb5e4f9cc5e932f453a964255 Mon Sep 17 00:00:00 2001 From: Slava Shishkin Date: Thu, 14 May 2020 17:53:47 +0300 Subject: [PATCH] Bug 25506: Fix for "Use of uninitialized value" in about.pl Perl warning on the "About Koha" page: Use of uninitialized value in string eq at /home/vagrant/kohaclone/about.pl line 220. Fixed by adding additional precheck for C4::Context->config('zebra_auth_index_mode') being Perl's "true". To test: 1) Ensure you don't have "... " in your koha-conf.xml so you will have "C4::Context->config" returning "undef" 2) Go to the "About Koha" page. 3) Observe the warning in the log file. 4) Apply patch. 5) Repeat step 2. 6) Check that previous warning was suppressed. Signed-off-by: Andreas Roussos Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit 67ff0f72854d4dabdda8cb59696f15e7b5d88c2a) Signed-off-by: Aleisha Amohia (cherry picked from commit 95c56339b9d0de7a8b5d10a77b52917ec79ff1fe) Signed-off-by: Victor Grousset/tuxayo --- about.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/about.pl b/about.pl index 4738c32ad0..c2b82d7be7 100755 --- a/about.pl +++ b/about.pl @@ -189,7 +189,10 @@ if ( C4::Context->config('zebra_auth_index_mode') push @xml_config_warnings, { error => 'zebra_auth_index_mode_is_grs1' }; } -if ( (C4::Context->config('zebra_auth_index_mode') eq 'dom') && ($context->{'server'}->{'authorityserver'}->{'config'} !~ /zebra-authorities-dom.cfg/) ) { +if( ( C4::Context->config('zebra_auth_index_mode') + and C4::Context->config('zebra_auth_index_mode') eq 'dom' ) + && ( $context->{'server'}->{'authorityserver'}->{'config'} !~ /zebra-authorities-dom.cfg/ ) ) +{ push @xml_config_warnings, { error => 'zebra_auth_index_mode_mismatch_warn' }; -- 2.39.5