[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.07-21-gb9687ad

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.10.x has been updated
       via  b9687ad6a6f638bc25fb2cad12fa5da73c10e714 (commit)
      from  fd0daa1729abb0eee60786a80562c341f47b72b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b9687ad6a6f638bc25fb2cad12fa5da73c10e714
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Feb 19 11:41:59 2013 -0500

    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 <gmc at esilibrary.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 71b79d59908cd85130afd8600eff0f93fc79b8a9)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 69a8048eeecacff99b64fa722fa8850891476031)
    
    Solved Conflicts in C4/Auth.pm
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit 69a8048eeecacff99b64fa722fa8850891476031)

-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository