From 286ac18e437f6727921e215fc4ede0994c0b32a9 Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Sat, 17 Sep 2011 12:45:09 +0100 Subject: [PATCH] Bug 6877 - use is executed and errors at compile time Content-Type: text/plain; charset="utf-8" Although use is being called in an eval it will still be executed at compile time so that an error can cause the script to abort before the eval is executed. The eval expression syntax is not checked so eval block should be preferred. Use require/import which execute at runtime which is the intention here. --- opac/opac-detail.pl | 5 ++++- opac/opac-showreviews.pl | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index e18e046..009e276 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -299,7 +299,10 @@ $template->param( ); my $libravatar_enabled = 0; -eval 'use Libravatar::URL'; +eval { + require Libravatar::URL; + Libravatar::URL->import(); +}; if (!$@ and C4::Context->preference('ShowReviewer') and C4::Context->preference('ShowReviewerPhoto')) { $libravatar_enabled = 1; } diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl index 3a74270..6402831 100755 --- a/opac/opac-showreviews.pl +++ b/opac/opac-showreviews.pl @@ -66,7 +66,10 @@ if($format eq "rss"){ } my $libravatar_enabled = 0; -eval 'use Libravatar::URL'; +eval { + require Libravatar::URL; + Libravatar::URL->import(); +}; if (!$@ and C4::Context->preference('ShowReviewer') and C4::Context->preference('ShowReviewerPhoto')) { $libravatar_enabled = 1; } -- 1.7.6