Bugzilla – Attachment 59749 Details for
Bug 17982
Fix the use of uniq in sub themelanguage
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17982: Fix the use of uniq in sub themelanguage
Bug-17982-Fix-the-use-of-uniq-in-sub-themelanguage.patch (text/plain), 1.99 KB, created by
Mark Tompsett
on 2017-02-01 18:40:57 UTC
(
hide
)
Description:
Bug 17982: Fix the use of uniq in sub themelanguage
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2017-02-01 18:40:57 UTC
Size:
1.99 KB
patch
obsolete
>From c4849e2a1d150925e8c4c05b52a4d72129eb2d00 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Tue, 24 Jan 2017 16:39:28 +0100 >Subject: [PATCH] Bug 17982: Fix the use of uniq in sub themelanguage > >Doing uniq( \@themes ) is useless. It will just return to you the only >reference you gave it. >List::MoreUtils::uniq requires a list instead of an arrayref. >So it is a trivial fix that makes sub themelanguage return one theme instead >of three themes like [ 'prog', 'prog', 'prog' ]. >Note that Template->new inserts one or two include paths to TT for each of >these three identical themes. > >Note: Removed a overcomplete unit test that basically tested uniq with >uniq in order to remove a dependency for a more important bug report. > >Test plan: >[1] Run t/db_dependent/Auth.t (triggering themelanguage) >[2] Open a page on OPAC or intranet. (Did you restart Plack?) > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> > >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> >--- > C4/Templates.pm | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > >diff --git a/C4/Templates.pm b/C4/Templates.pm >index eebff11..10d0283 100644 >--- a/C4/Templates.pm >+++ b/C4/Templates.pm >@@ -256,18 +256,18 @@ sub themelanguage { > my $where = $tmpl =~ /xsl$/ ? 'xslt' : 'modules'; > for my $theme (@themes) { > if ( -e "$htdocs/$theme/$lang/$where/$tmpl" ) { >- return ( $theme, $lang, uniq( \@themes ) ); >+ return ( $theme, $lang, [ uniq(@themes) ] ); > } > } > # Otherwise return theme/'en', last resort fallback/'en' > for my $theme (@themes) { > if ( -e "$htdocs/$theme/en/$where/$tmpl" ) { >- return ( $theme, 'en', uniq( \@themes ) ); >+ return ( $theme, 'en', [ uniq(@themes) ] ); > } > } > # tmpl is a full path, so this is a template for a plugin > if ( $tmpl =~ /^\// && -e $tmpl ) { >- return ( $themes[0], $lang, uniq( \@themes ) ); >+ return ( $themes[0], $lang, [ uniq(@themes) ] ); > } > } > >-- >2.1.4
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 17982
:
59511
|
59537
|
59630
|
59747
|
59748
|
59749
|
59750
|
59765
|
59766
|
59790
|
59791