[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1147-g45b85a7

[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, master has been updated
       via  45b85a700fcb4c9db07ec0bd13ecd8463696c4c2 (commit)
       via  3ae471a352fa2b00782c29c5c40f39db04fe510a (commit)
      from  ace550530550ba72b93f34b446e681ab72024f8c (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 45b85a700fcb4c9db07ec0bd13ecd8463696c4c2
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Thu Sep 19 12:40:03 2013 -0300

    Bug 10915: (QA followup) warn if cannot read history.txt
    
    This patch makes about.pl test if success opening history.txt, and
    shows a convenient warning to the end user. No more warnings in the logs
    (about.pl: readline() on closed filehandle $file at /usr/share/koha/intranet/cgi-bin/about.pl line 166)
    and better problem solving information for the end user.
    
    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 3ae471a352fa2b00782c29c5c40f39db04fe510a
Author: Mason James <mtj at kohaaloha.com>
Date:   Fri Sep 20 00:06:20 2013 +1200

    Bug 10915: fix About->timeline breakage on incompletely upgraded Koha
    
    This patch supplies a default value for the koha-conf.xml
    setting docdir to handle the case where the user neglects
    to set it upon upgrade.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Fixes dev and standard installs without docdic tag in koha-conf.xml.
    Doesn't break when docdir present either. Warning still present
    on packages install that didn't add the docdir definition in koha-conf.xml
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 about.pl                                         |   68 +++++++++++++---------
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    6 ++
 2 files changed, 46 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
main Koha release repository