[koha-commits] main Koha release repository branch 3.8.x updated. v3.08.11-45-g4e6faeb

[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.8.x has been updated
       via  4e6faebc94a683b76fa096ebd3f899dd8676ca31 (commit)
       via  854a4525d87cd3dc6dcaa9d5d265dfdad95d9e8f (commit)
      from  5634fc955de5efaa2974b47888401a686ff4c855 (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 4e6faebc94a683b76fa096ebd3f899dd8676ca31
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Oct 2 09:25:16 2012 -0400

    Bug 8860 - can't merge if you don't have fast cataloging permissions
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 854a4525d87cd3dc6dcaa9d5d265dfdad95d9e8f
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Sep 7 13:34:04 2012 +0800

    Bug 8737 - Incorrect icon at login in staff client
    
    Added the following missing code to ensure the correct icon
    is used when logged out:
       IntranetFavicon => C4::Context->preference('IntranetFavicon')
    This was added into an existing $template->param() call.
    
    Not to be confused with the koha logo on the login page, the
    icon is a 16x16 pixel graphic in the browser tab. The default
    is found at .../intranet-tmpl/prog/en/includes/favicon.ico.
    
    If the "IntranetFavicon" system preference is set, it should be
    used by the staff client regardless of login state. It was not
    being used in the "AUTH rejected" section of Auth.pm, but the
    OpacFavicon variable was being set. This explains why the
    "OpacFavicon" system preference works for the OPAC client, but
    not the staff client upon logout.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

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


hooks/post-receive
-- 
main Koha release repository