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

(-)a/C4/Languages.pm (-1 / +1 lines)
Lines 696-702 sub getlanguage { Link Here
696
            @languages = split /,/, $preference_value;
696
            @languages = split /,/, $preference_value;
697
        }
697
        }
698
698
699
        # Chose language from the URL
699
        # Choose language from the URL
700
        my $cgi_param_language = $cgi->param( 'language' );
700
        my $cgi_param_language = $cgi->param( 'language' );
701
        if ( defined $cgi_param_language && any { $_ eq $cgi_param_language } @languages) {
701
        if ( defined $cgi_param_language && any { $_ eq $cgi_param_language } @languages) {
702
            $language = $cgi_param_language;
702
            $language = $cgi_param_language;
(-)a/t/Languages.t (-2 / +1 lines)
Lines 82-88 subtest 'when interface is not intranet or opac' => sub { Link Here
82
82
83
    Koha::Language->set_requested_language('fr-FR');
83
    Koha::Language->set_requested_language('fr-FR');
84
    $cache->clear_from_cache('getlanguage');
84
    $cache->clear_from_cache('getlanguage');
85
    is(C4::Languages::getlanguage(), 'fr-FR', 'but language requested through Koha::Language is prefered');
85
    is(C4::Languages::getlanguage(), 'fr-FR', 'but language requested through Koha::Language is preferred');
86
86
87
    @languages = ();
87
    @languages = ();
88
    $cache->clear_from_cache('getlanguage');
88
    $cache->clear_from_cache('getlanguage');
89
- 

Return to bug 38630