[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-42-g61d8236

[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  61d82360beae443b21ca439b97fe033bb5920173 (commit)
       via  9e2b58b582531859fbdede3b327c18b5f7db8e6e (commit)
      from  75334ca55de4f15484cc524ad827d5862aa99ccd (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 61d82360beae443b21ca439b97fe033bb5920173
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Fri Apr 19 22:52:07 2013 -0400

    Bug 10085: unapi does not function under Plack
    
    The following errors appear when trying to use unapi under Plack (among
    others):
    Variable "$cgi" is not available at /home/jcamins/kohaclone/opac/unapi line 160.
    Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 173.
    Variable "$format_info" is not available at /home/jcamins/kohaclone/opac/unapi line 174.
    Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 185.
    
    To test:
    1) Try to view /cgi-bin/koha/unapi under Plack
    2) There is no step 2. Plack crashes.
    3) Apply patch.
    4) Try to view /cgi-bin/koha/unapi again, and note that it doesn't crash
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    I'm puzzled how this ever worked anyway, accidentally i'm guessing,
    this tidies up some lazy coding
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 9e2b58b582531859fbdede3b327c18b5f7db8e6e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Feb 7 09:57:47 2013 -0500

    Bug 9523: importing staged bib records hangs if a matched bib has been deleted
    
    Test Plan:
    1) Stage a MARC record file that will have matches with existing records
    2) Delete the bib from Koha that was matched on
    3) Attempt to import the records into Koha, the import will hang
    4) Apply the patch
    5) Reload manage-marc-import.pl and attempt to import again, this time it should succeed.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 C4/ImportBatch.pm |    1 +
 opac/unapi        |    9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository