[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.10-52-gacd7f91

[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.22.x has been updated
       via  acd7f9150f1ccf96b42466cacc8a6ccac80ee0b2 (commit)
      from  1096c177a79a55ad134466efd7e2c65605e7714c (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 acd7f9150f1ccf96b42466cacc8a6ccac80ee0b2
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Jul 23 12:43:54 2014 -0400

    Bug 12629 - Software error when trying to merge records from different frameworks
    
    Test Plan:
    1) Choose a bib record that has the default framework.
    2) Add a second record using that fast add framework.
    3) Merge the records; switch to "Using framework: Default", and choose the original record (i.e. the one that had the default framework) as the merge reference. Clicking 'Next' will trigger the error.
    4) Apply this patch
    5) Repeat steps 1 - 3, no error should occur
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit e8fcc651a3aa9af9d1a49a6cec64fc9bde737a86)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit 0b4d68f0601a494c00b19d14c5af970ff04a0122)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 Koha/Util/MARC.pm |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository