From b086b8b64244e459cac8f391dc5b3ced06324019 Mon Sep 17 00:00:00 2001 From: GeorgeClark Date: Sat, 5 Oct 2013 19:43:15 +0000 Subject: [PATCH] Item12592: Better warnings / errors git-svn-id: http://svn.foswiki.org/trunk@16888 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 --- .../Configure/Checkers/Cache/Implementation.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/core/lib/Foswiki/Configure/Checkers/Cache/Implementation.pm b/core/lib/Foswiki/Configure/Checkers/Cache/Implementation.pm index cae4bbfaeb..1f72192d06 100755 --- a/core/lib/Foswiki/Configure/Checkers/Cache/Implementation.pm +++ b/core/lib/Foswiki/Configure/Checkers/Cache/Implementation.pm @@ -11,19 +11,26 @@ use Foswiki::Configure::Dependency; sub check { my $this = shift; - my $e = ''; + my $e = q{}; - my $implementation = $Foswiki::cfg{Cache}{Implementation} || ''; + my $implementation = $Foswiki::cfg{Cache}{Implementation} || q{}; my ($module) = $implementation =~ m/Foswiki::PageCache::(.*)/; - return unless ( $module && ( $module ne 'DBI::Generic' ) ); + return if ( !$module || ( $module eq 'DBI::Generic' ) ); $module =~ s/^DBI::/DBD::/; $e = $this->checkPerlModule( $module, "Required to use $implementation.", 0 ); - return ( ( $e =~ m/Not installed./ ) ? $this->ERROR($e) : $this->NOTE($e) ); + if ( $Foswiki::cfg{Cache}{Enabled} ) { + return ( + ( $e =~ m/Not installed./ ) ? $this->ERROR($e) : $this->NOTE($e) ); + } + else { + return ( + ( $e =~ m/Not installed./ ) ? $this->WARN($e) : $this->NOTE($e) ); + } } 1;