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

(-)a/C4/Auth.pm (-3 / +5 lines)
Lines 387-392 sub get_template_and_user { Link Here
387
        } elsif (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv && C4::Context->userenv->{'branch'}) {
387
        } elsif (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv && C4::Context->userenv->{'branch'}) {
388
            $opac_name = C4::Context->userenv->{'branch'};
388
            $opac_name = C4::Context->userenv->{'branch'};
389
        }
389
        }
390
        my $opac_base_url = C4::Context->preference("OPACBaseURL");
391
        if (!$opac_base_url){
392
            $opac_base_url = $ENV{'SERVER_NAME'} . ($ENV{'SERVER_PORT'} eq ($in->{'query'}->https() ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}");
393
        }
390
        $template->param(
394
        $template->param(
391
            opaccolorstylesheet       => C4::Context->preference("opaccolorstylesheet"),
395
            opaccolorstylesheet       => C4::Context->preference("opaccolorstylesheet"),
392
            AnonSuggestions           => "" . C4::Context->preference("AnonSuggestions"),
396
            AnonSuggestions           => "" . C4::Context->preference("AnonSuggestions"),
Lines 407-414 sub get_template_and_user { Link Here
407
            OPACMobileUserCSS         => "". C4::Context->preference("OPACMobileUserCSS"),
411
            OPACMobileUserCSS         => "". C4::Context->preference("OPACMobileUserCSS"),
408
            OPACViewOthersSuggestions => "" . C4::Context->preference("OPACViewOthersSuggestions"),
412
            OPACViewOthersSuggestions => "" . C4::Context->preference("OPACViewOthersSuggestions"),
409
            OpacAuthorities           => C4::Context->preference("OpacAuthorities"),
413
            OpacAuthorities           => C4::Context->preference("OpacAuthorities"),
410
            OPACBaseURL               => ($in->{'query'}->https() ? "https://" : "http://") . $ENV{'SERVER_NAME'} .
414
            OPACBaseURL               => ($in->{'query'}->https() ? "https://" : "http://") . $opac_base_url,
411
                   ($ENV{'SERVER_PORT'} eq ($in->{'query'}->https() ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}"),
412
            opac_css_override         => $ENV{'OPAC_CSS_OVERRIDE'},
415
            opac_css_override         => $ENV{'OPAC_CSS_OVERRIDE'},
413
            opac_search_limit         => $opac_search_limit,
416
            opac_search_limit         => $opac_search_limit,
414
            opac_limit_override       => $opac_limit_override,
417
            opac_limit_override       => $opac_limit_override,
415
- 

Return to bug 11575