Item13066: update expand to expandValue in checkers

foswiki · Nov 2, 2014 · 3d05960 · 3d05960
1 parent 4e7d58f
commit 3d05960
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/core/lib/Foswiki/Configure/Checkers/Email/SSLCaFile.pm b/core/lib/Foswiki/Configure/Checkers/Email/SSLCaFile.pm
@@ -40,8 +40,8 @@ sub check_current_value {
         }
     }
 
-    my $path =
-      Foswiki::Configure::Load::expand( $Foswiki::cfg{Email}{SSLCaPath} );
+    my $path = $Foswiki::cfg{Email}{SSLCaPath};
+    Foswiki::Configure::Load::expandValue($path);
     if ( $path && !( -d $path && -r $path ) ) {
         $reporter->ERROR(
             -d $path ? "$path is not readable" : "$path is not a directory" );

diff --git a/core/lib/Foswiki/Configure/Checkers/Email/SSLCaPath.pm b/core/lib/Foswiki/Configure/Checkers/Email/SSLCaPath.pm
@@ -14,8 +14,8 @@ sub check_current_value {
       unless ( $Foswiki::cfg{Email}{MailMethod} =~ /^Net::SMTP/
         && $Foswiki::cfg{Email}{SSLVerifyServer} );
 
-    my $file =
-      Foswiki::Configure::Load::expand( $Foswiki::cfg{Email}{SSLCaFile} );
+    my $file = $Foswiki::cfg{Email}{SSLCaFile};
+    Foswiki::Configure::Load::expandValue($file);
 
     if ( $file && !-r $file ) {
         $reporter->ERROR("Unable to read $file");
@@ -36,8 +36,8 @@ sub check_current_value {
         );
     }
 
-    my $cfile =
-      Foswiki::Configure::Load::expand( $Foswiki::cfg{Email}{SSLCrlFile} );
+    my $cfile = $Foswiki::cfg{Email}{SSLCrlFile};
+    Foswiki::Configure::Load::expandValue($cfile);
     if ( $Foswiki::cfg{Email}{SSLCheckCRL}
         && !( $path || $cfile ) )
     {

diff --git a/core/lib/Foswiki/Configure/Checkers/LANGUAGE.pm b/core/lib/Foswiki/Configure/Checkers/LANGUAGE.pm
@@ -25,7 +25,8 @@ sub check_current_value {
     my $enabled = $this->{item}->getExpandedValue();
     return unless $enabled;
 
-    my $dir = Foswiki::Configure::Load::expand( $Foswiki::cfg{LocalesDir} );
+    my $dir = $Foswiki::cfg{LocalesDir};
+    Foswiki::Configure::Load::expandValue($dir);
     my $compress = $Foswiki::cfg{LanguageFileCompression};
 
     my $lang = $this->{item}->{keys};