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

(-)a/C4/Auth.pm (-3 / +5 lines)
Lines 404-409 sub get_template_and_user { Link Here
404
        } elsif (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv && C4::Context->userenv->{'branch'}) {
404
        } elsif (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv && C4::Context->userenv->{'branch'}) {
405
            $opac_name = C4::Context->userenv->{'branch'};
405
            $opac_name = C4::Context->userenv->{'branch'};
406
        }
406
        }
407
        my $opac_base_url = C4::Context->preference("OPACBaseURL");
408
        if (!$opac_base_url){
409
            $opac_base_url = $ENV{'SERVER_NAME'} . ($ENV{'SERVER_PORT'} eq ($using_https ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}");
410
        }
407
        $template->param(
411
        $template->param(
408
            opaccolorstylesheet       => C4::Context->preference("opaccolorstylesheet"),
412
            opaccolorstylesheet       => C4::Context->preference("opaccolorstylesheet"),
409
            AnonSuggestions           => "" . C4::Context->preference("AnonSuggestions"),
413
            AnonSuggestions           => "" . C4::Context->preference("AnonSuggestions"),
Lines 424-431 sub get_template_and_user { Link Here
424
            OPACMobileUserCSS         => "". C4::Context->preference("OPACMobileUserCSS"),
428
            OPACMobileUserCSS         => "". C4::Context->preference("OPACMobileUserCSS"),
425
            OPACViewOthersSuggestions => "" . C4::Context->preference("OPACViewOthersSuggestions"),
429
            OPACViewOthersSuggestions => "" . C4::Context->preference("OPACViewOthersSuggestions"),
426
            OpacAuthorities           => C4::Context->preference("OpacAuthorities"),
430
            OpacAuthorities           => C4::Context->preference("OpacAuthorities"),
427
            OPACBaseURL               => ($in->{'query'}->https() ? "https://" : "http://") . $ENV{'SERVER_NAME'} .
431
            OPACBaseURL               => ($using_https ? "https://" : "http://") . $opac_base_url,
428
                   ($ENV{'SERVER_PORT'} eq ($in->{'query'}->https() ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}"),
429
            opac_css_override         => $ENV{'OPAC_CSS_OVERRIDE'},
432
            opac_css_override         => $ENV{'OPAC_CSS_OVERRIDE'},
430
            opac_search_limit         => $opac_search_limit,
433
            opac_search_limit         => $opac_search_limit,
431
            opac_limit_override       => $opac_limit_override,
434
            opac_limit_override       => $opac_limit_override,
432
- 

Return to bug 11575