Bugzilla – Attachment 20447 Details for
Bug 5202
Merge authority records
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 5202: Quiet warning
PASSED-QA-Bug-5202-Quiet-warning.patch (text/plain), 1.07 KB, created by
Katrin Fischer
on 2013-08-18 18:50:58 UTC
(
hide
)
Description:
[PASSED QA] Bug 5202: Quiet warning
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-08-18 18:50:58 UTC
Size:
1.07 KB
patch
obsolete
>From 052668b2fd4392a1e057ea6af5b096bd4af8b126 Mon Sep 17 00:00:00 2001 >From: Jared Camins-Esakov <jcamins@cpbibliography.com> >Date: Sun, 18 Aug 2013 12:41:18 -0400 >Subject: [PATCH] [PASSED QA] Bug 5202: Quiet warning > >$mergereference is not always defined, so we should check it is >defined before checking its value. > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > authorities/merge.pl | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/authorities/merge.pl b/authorities/merge.pl >index 0c7a7ea..be24c8e 100755 >--- a/authorities/merge.pl >+++ b/authorities/merge.pl >@@ -94,7 +94,7 @@ else { > my $recordObj1 = Koha::Authority->get_from_authid($authid[0]) || Koha::Authority->new(); > my $recordObj2; > >- if ($mergereference eq 'breeding') { >+ if (defined $mergereference && $mergereference eq 'breeding') { > $recordObj2 = Koha::Authority->get_from_breeding($authid[1]) || Koha::Authority->new(); > } else { > $recordObj2 = Koha::Authority->get_from_authid($authid[1]) || Koha::Authority->new(); >-- >1.7.9.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 5202
:
18443
|
18514
|
18516
|
18532
|
19436
|
19634
|
19891
|
19892
|
20099
|
20100
|
20101
|
20440
|
20441
|
20442
|
20443
|
20444
|
20445
|
20446
| 20447 |
20448
|
20449