Bugzilla – Attachment 30007 Details for
Bug 12629
Software error when trying to merge records from different frameworks
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12629 - Software error when trying to merge records from different frameworks
Bug-12629---Software-error-when-trying-to-merge-re.patch (text/plain), 1.35 KB, created by
Kyle M Hall (khall)
on 2014-07-23 16:45:00 UTC
(
hide
)
Description:
Bug 12629 - Software error when trying to merge records from different frameworks
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2014-07-23 16:45:00 UTC
Size:
1.35 KB
patch
obsolete
>From 868b04f1aa56432ff0670b96cc006ef28b474f13 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >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 >--- > Koha/Util/MARC.pm | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > >diff --git a/Koha/Util/MARC.pm b/Koha/Util/MARC.pm >index 5d026ee..709eae3 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, > { >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12629
:
29960
|
30007
|
55386
|
55525