Bugzilla – Attachment 29811 Details for
Bug 12600
Duplicated use statement in Search.pm
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch
0001-Bug-12600-remove-duplicate-use-statement-from-code.patch (text/plain), 1.82 KB, created by
Colin Campbell
on 2014-07-18 09:02:04 UTC
(
hide
)
Description:
Proposed patch
Filename:
MIME Type:
Creator:
Colin Campbell
Created:
2014-07-18 09:02:04 UTC
Size:
1.82 KB
patch
obsolete
>From 213ceb1fd9c99083b16a1b4fbab7692d2cd061eb Mon Sep 17 00:00:00 2001 >From: Colin Campbell <colin.campbell@ptfs-europe.com> >Date: Fri, 18 Jul 2014 09:50:34 +0100 >Subject: [PATCH] Bug 12600: remove duplicate use statement from code > >A use C4::Charset was added deep in the body of the code >we have already imported it at the top of the file >(the by convention normal place) As use is executed at compile time >specifying it in the code body does not serve a >useful purpose and detracts from the readability of an already >overly complex subroutine. >Remove the superfluous statement >also removed the tabs introduced to the surrounding lines >by the same commit >--- > C4/Search.pm | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > >diff --git a/C4/Search.pm b/C4/Search.pm >index 1b5c6fa..018a08a 100644 >--- a/C4/Search.pm >+++ b/C4/Search.pm >@@ -2047,13 +2047,12 @@ sub searchResults { > } > > # XSLT processing of some stuff >- use C4::Charset; >- SetUTF8Flag($marcrecord); >+ SetUTF8Flag($marcrecord); > warn $marcrecord->as_formatted if $DEBUG; >- my $interface = $search_context eq 'opac' ? 'OPAC' : ''; >- if (!$scan && C4::Context->preference($interface . "XSLTResultsDisplay")) { >+ my $interface = $search_context eq 'opac' ? 'OPAC' : ''; >+ if (!$scan && C4::Context->preference($interface . "XSLTResultsDisplay")) { > $oldbiblio->{XSLTResultsRecord} = XSLTParse4Display($oldbiblio->{biblionumber}, $marcrecord, $interface."XSLTResultsDisplay", 1, \@hiddenitems); >- # the last parameter tells Koha to clean up the problematic ampersand entities that Zebra outputs >+ # the last parameter tells Koha to clean up the problematic ampersand entities that Zebra outputs > } > > # if biblio level itypes are used and itemtype is notforloan, it can't be reserved either >-- >1.9.3 >
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 12600
:
29811
|
30153
|
30161