From 8f45dbd5619ae364eb77ba47bf754691066bce94 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Sat, 17 Sep 2011 00:42:45 +0200 Subject: [PATCH] Bug 6875 cleaning opac-detail.pl C4::Tags and C4::Reviews used only if the feature is activated. Changing the use to a require inside the if (after testing it's activated) For libraries that have activated both, that means no change, but for others, it's an improvement --- opac/opac-detail.pl | 50 ++++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 24 deletions(-) diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 7e8dd37..e71b1d6 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -31,12 +31,10 @@ use C4::Output; use C4::Biblio; use C4::Items; use C4::Circulation; -use C4::Tags qw(get_tags); use C4::Dates qw/format_date/; use C4::XISBN qw(get_xisbns get_biblionumber_from_isbn); use C4::External::Amazon; use C4::External::Syndetics qw(get_syndetics_index get_syndetics_summary get_syndetics_toc get_syndetics_excerpt get_syndetics_reviews get_syndetics_anotes ); -use C4::Review; use C4::Members; use C4::VirtualShelves; use C4::XSLT; @@ -302,28 +300,33 @@ eval 'use Libravatar::URL'; if (!$@ and C4::Context->preference('ShowReviewer') and C4::Context->preference('ShowReviewerPhoto')) { $libravatar_enabled = 1; } - -my $reviews = getreviews( $biblionumber, 1 ); -my $loggedincommenter; -foreach ( @$reviews ) { - my $borrowerData = GetMember('borrowernumber' => $_->{borrowernumber}); - # setting some borrower info into this hash - $_->{title} = $borrowerData->{'title'}; - $_->{surname} = $borrowerData->{'surname'}; - $_->{firstname} = $borrowerData->{'firstname'}; - if ($libravatar_enabled and $borrowerData->{'email'}) { - $_->{avatarurl} = libravatar_url(email => $borrowerData->{'email'}, https => $ENV{HTTPS}); +if (C4::Context->preference("reviewson")) { + require C4::Review; + my $reviews = C4::Review::getreviews( $biblionumber, 1 ); + my $loggedincommenter; + foreach ( @$reviews ) { + my $borrowerData = GetMember('borrowernumber' => $_->{borrowernumber}); + # setting some borrower info into this hash + $_->{title} = $borrowerData->{'title'}; + $_->{surname} = $borrowerData->{'surname'}; + $_->{firstname} = $borrowerData->{'firstname'}; + if ($libravatar_enabled and $borrowerData->{'email'}) { + $_->{avatarurl} = libravatar_url(email => $borrowerData->{'email'}, https => $ENV{HTTPS}); + } + $_->{userid} = $borrowerData->{'userid'}; + $_->{cardnumber} = $borrowerData->{'cardnumber'}; + $_->{datereviewed} = format_date($_->{datereviewed}); + if ($borrowerData->{'borrowernumber'} eq $borrowernumber) { + $_->{your_comment} = 1; + $loggedincommenter = 1; + } } - $_->{userid} = $borrowerData->{'userid'}; - $_->{cardnumber} = $borrowerData->{'cardnumber'}; - $_->{datereviewed} = format_date($_->{datereviewed}); - if ($borrowerData->{'borrowernumber'} eq $borrowernumber) { - $_->{your_comment} = 1; - $loggedincommenter = 1; - } + $template->param( + reviews => $reviews, + loggedincommenter => $loggedincommenter + ); } - if(C4::Context->preference("ISBD")) { $template->param(ISBD => 1); } @@ -334,8 +337,6 @@ $template->param( biblionumber => $biblionumber, subscriptions => \@subs, subscriptionsnumber => $subscriptionsnumber, - reviews => $reviews, - loggedincommenter => $loggedincommenter ); # Lists @@ -546,12 +547,13 @@ if (C4::Context->preference("BakerTaylorEnabled")) { my $tag_quantity; if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnDetail')) { + require C4::Tags; $template->param( TagsEnabled => 1, TagsShowOnDetail => $tag_quantity, TagsInputOnDetail => C4::Context->preference('TagsInputOnDetail') ); - $template->param(TagLoop => get_tags({biblionumber=>$biblionumber, approved=>1, + $template->param(TagLoop => C4::Tags::get_tags({biblionumber=>$biblionumber, approved=>1, 'sort'=>'-weight', limit=>$tag_quantity})); } -- 1.7.4.1