From c79b16747c9ef37a353f4f9c8d9463c50cc41af9 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 23 Jul 2014 12:43:54 -0400 Subject: [PATCH] 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 Signed-off-by: Jonathan Druart --- Koha/Util/MARC.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Koha/Util/MARC.pm b/Koha/Util/MARC.pm index 22774b6..63477ea 100644 --- a/Koha/Util/MARC.pm +++ b/Koha/Util/MARC.pm @@ -43,8 +43,11 @@ sub createMergeHash { foreach my $field (@fields) { my $fieldtag = $field->tag(); if ( $fieldtag < 10 ) { - if ( !defined($tagslib) - || $tagslib->{$fieldtag}->{'@'}->{'tab'} >= 0 ) + if ( + !defined($tagslib) + || ( defined( $tagslib->{$fieldtag} ) + && $tagslib->{$fieldtag}->{'@'}->{'tab'} >= 0 ) + ) { push @array, { tag => $fieldtag, -- 2.8.1