Attachment 121449 Details for Bug 26734 – Bug 26734: [ALT] Renamed activethemes with availablethemes

[patch] Bug 26734: [ALT] Renamed activethemes with availablethemes

Bug-26734-ALT-Renamed-activethemes-with-availablet.patch (text/plain), 2.67 KB, created by Martin Renvoize (ashimema) on 2021-05-27 12:58:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-05-27 12:58:25 UTC

Size: 2.67 KB

patch

obsolete

>From cc02b7b1c4a51f1028a4f18ae1ad4fd47334a528 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 27 May 2021 14:25:11 +0200
>Subject: [PATCH] Bug 26734: [ALT] Renamed 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 <martin.renvoize@ptfs-europe.com>
>---
> 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.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 26734: 111976 | 111977 | 111978 | 112023 | 112024 | 112025 | 112026 | 116257 | 116259 | 116260 | 116261 | 116262 | 116263 | 116272 | 116275 | 116276 | 116277 | 116278 | 116279 | 116644 | 116645 | 116646 | 116647 | 116648 | 116655 | 116656 | 116657 | 116658 | 116659 | 116663 | 116664 | 116665 | 116666 | 116667 | 117261 | 117262 | 117263 | 117264 | 117265 | 118191 | 118192 | 118193 | 118194 | 118195 | 118196 | 118197 | 118200 | 118482 | 118483 | 118484 | 118485 | 118486 | 118487 | 118488 | 118489 | 119350 | 119351 | 119352 | 119353 | 119354 | 119355 | 119356 | 119357 | 119358 | 119642 | 120077 | 121446 | 121449