From e66d69fa3eaa42f484d47f1fffbf7a91156c3223 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 27 May 2021 14:25:11 +0200 Subject: [PATCH] Bug 26734: Rename activethemes with availablethemes There was an existing call to $self->activethemes that behave as setter: 85 $self->activethemes($activethemes); I am not sure what are the side-effects but it does not look good. It caused warning in the logs: Use of uninitialized value $interface in string eq at /kohadevbox/koha/C4/Templates.pm line 279. Use of uninitialized value $interface in string eq at /kohadevbox/koha/C4/Templates.pm line 280. Use of uninitialized value $interface in string eq at /kohadevbox/koha/C4/Templates.pm line 282. Use of uninitialized value $lang in concatenation (.) or string at /kohadevbox/koha/C4/Templates.pm line 296. Use of uninitialized value $lang in concatenation (.) or string at /kohadevbox/koha/C4/Templates.pm line 296. Use of uninitialized value $lang in concatenation (.) or string at /kohadevbox/koha/C4/Templates.pm line 296 Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart --- C4/Letters.pm | 6 +++--- C4/Templates.pm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/C4/Letters.pm b/C4/Letters.pm index 99768ed656..b8de25bdc8 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -1546,12 +1546,12 @@ sub _process_tt { my $loops = $params->{loops}; my $substitute = $params->{substitute} || {}; my $lang = defined($params->{lang}) && $params->{lang} ne 'default' ? $params->{lang} : 'en'; - my ($theme, $activethemes); + my ($theme, $availablethemes); my $htdocs = C4::Context->config('intrahtdocs'); - ($theme, $lang, $activethemes)= C4::Templates::activethemes( $htdocs, 'about.tt', 'intranet', $lang); + ($theme, $lang, $availablethemes)= C4::Templates::availablethemes( $htdocs, 'about.tt', 'intranet', $lang); my @includes; - foreach (@$activethemes) { + foreach (@$availablethemes) { push @includes, "$htdocs/$_/$lang/includes"; push @includes, "$htdocs/$_/en/includes" unless $lang eq 'en'; } diff --git a/C4/Templates.pm b/C4/Templates.pm index 2aeedf662e..644e235b91 100644 --- a/C4/Templates.pm +++ b/C4/Templates.pm @@ -268,10 +268,10 @@ sub themelanguage { # Select a language based on cookie, syspref available languages & browser my $lang = C4::Languages::getlanguage($query); - return activethemes($htdocs, $tmpl, $interface, $lang); + return availablethemes($htdocs, $tmpl, $interface, $lang); } -sub activethemes { +sub availablethemes { my ($htdocs, $tmpl, $interface, $lang) = @_; # Get theme -- 2.39.5