From b9687ad6a6f638bc25fb2cad12fa5da73c10e714 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 19 Feb 2013 11:41:59 -0500 Subject: [PATCH] Bug 9541: make OPAC login page respect OPAC_CSS_OVERRIDE When clicking the login link for opac-user.pl in a multiple branch scenario the environment variable for OPAC_CSS_OVERRIDE was ignored from the koha-conf.xml file. It seems like is is working on every page in the opac except for the login page. Test Plan: 1) Set up a Koha server with 2 separate catalog configurations ( e.g. opac1.kohatest, opac2.kohatest ) 2) Set the OPAC_CSS_OVERRIDE directive for separate css files in each opac 3) Browse to the opac login page, note the css is not applied 4) Apply this patch 5) Reload the page, note the css is now applied Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 71b79d59908cd85130afd8600eff0f93fc79b8a9) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 69a8048eeecacff99b64fa722fa8850891476031) Solved Conflicts in C4/Auth.pm Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 69a8048eeecacff99b64fa722fa8850891476031) --- C4/Auth.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 2ae23f8772..ffe7e9ba7a 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -992,7 +992,8 @@ sub checkauth { intranetuserjs => C4::Context->preference("intranetuserjs"), IndependantBranches=> C4::Context->preference("IndependantBranches"), AutoLocation => C4::Context->preference("AutoLocation"), - wrongip => $info{'wrongip'}, + wrongip => $info{'wrongip'}, + opac_css_override => $ENV{'OPAC_CSS_OVERRIDE'}, ); $template->param( OpacPublic => C4::Context->preference("OpacPublic")); -- 2.39.5