View | Details | Raw Unified | Return to bug 26734
Collapse All | Expand All

(-)a/C4/Letters.pm (-3 / +3 lines)
Lines 1546-1557 sub _process_tt { Link Here
1546
    my $loops = $params->{loops};
1546
    my $loops = $params->{loops};
1547
    my $substitute = $params->{substitute} || {};
1547
    my $substitute = $params->{substitute} || {};
1548
    my $lang = defined($params->{lang}) && $params->{lang} ne 'default' ? $params->{lang} : 'en';
1548
    my $lang = defined($params->{lang}) && $params->{lang} ne 'default' ? $params->{lang} : 'en';
1549
    my ($theme, $activethemes);
1549
    my ($theme, $availablethemes);
1550
1550
1551
    my $htdocs = C4::Context->config('intrahtdocs');
1551
    my $htdocs = C4::Context->config('intrahtdocs');
1552
    ($theme, $lang, $activethemes)= C4::Templates::activethemes( $htdocs, 'about.tt', 'intranet', $lang);
1552
    ($theme, $lang, $availablethemes)= C4::Templates::availablethemes( $htdocs, 'about.tt', 'intranet', $lang);
1553
    my @includes;
1553
    my @includes;
1554
    foreach (@$activethemes) {
1554
    foreach (@$availablethemes) {
1555
        push @includes, "$htdocs/$_/$lang/includes";
1555
        push @includes, "$htdocs/$_/$lang/includes";
1556
        push @includes, "$htdocs/$_/en/includes" unless $lang eq 'en';
1556
        push @includes, "$htdocs/$_/en/includes" unless $lang eq 'en';
1557
    }
1557
    }
(-)a/C4/Templates.pm (-3 / +2 lines)
Lines 268-277 sub themelanguage { Link Here
268
    # Select a language based on cookie, syspref available languages & browser
268
    # Select a language based on cookie, syspref available languages & browser
269
    my $lang = C4::Languages::getlanguage($query);
269
    my $lang = C4::Languages::getlanguage($query);
270
270
271
    return activethemes($htdocs, $tmpl, $interface, $lang);
271
    return availablethemes($htdocs, $tmpl, $interface, $lang);
272
}
272
}
273
273
274
sub activethemes {
274
sub availablethemes {
275
    my ($htdocs, $tmpl, $interface, $lang) = @_;
275
    my ($htdocs, $tmpl, $interface, $lang) = @_;
276
276
277
    # Get theme
277
    # Get theme
278
- 

Return to bug 26734