From f7dedcbcde21a3bbd97791898b6a905bb627ae7a Mon Sep 17 00:00:00 2001 From: Juan Romay Sieira Date: Fri, 8 Apr 2011 14:45:05 +0200 Subject: [PATCH] In Auth.pm the var OPACBaseURL ignores the syspref OPACBaseURL. If this syspref is set, its value must be included in this param. Content-Type: text/plain; charset="utf-8" --- C4/Auth.pm | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 7a0c13e..fc448e6 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -416,8 +416,7 @@ sub get_template_and_user { OPACUserCSS => "". C4::Context->preference("OPACUserCSS"), OPACViewOthersSuggestions => "" . C4::Context->preference("OPACViewOthersSuggestions"), OpacAuthorities => C4::Context->preference("OpacAuthorities"), - OPACBaseURL => ($in->{'query'}->https() ? "https://" : "http://") . $ENV{'SERVER_NAME'} . - ($ENV{'SERVER_PORT'} eq ($in->{'query'}->https() ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}"), + OPACBaseURL => ($in->{'query'}->https() ? "https://" : "http://") . (C4::Context->preference("OPACBaseURL") ne '' ? C4::Context->preference("OPACBaseURL") : ($ENV{'SERVER_NAME'}) . ($ENV{'SERVER_PORT'} eq ($in->{'query'}->https() ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}")), opac_css_override => $ENV{'OPAC_CSS_OVERRIDE'}, opac_search_limit => $opac_search_limit, opac_limit_override => $opac_limit_override, -- 1.7.4.1