Item13928: Fix issues 2, 3, 4 & 6

foswiki · Apr 28, 2016 · 10ad2be · 10ad2be
1 parent 383a62d
commit 10ad2be
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/UnitTestContrib/lib/Unit/Request.pm b/UnitTestContrib/lib/Unit/Request.pm
@@ -21,10 +21,8 @@ sub new {
 
     # Taint everything
     foreach my $k ( @{ $this->{param_list} } ) {
-        foreach my $k ( @{ $this->{param_list} } ) {
-            foreach ( @{ $this->{param}{$k} } ) {
-                $_ = TAINT($_) if defined $_;
-            }
+        foreach ( @{ $this->{param}{$k} } ) {
+            $_ = TAINT($_) if defined $_;
         }
     }
     return $this;

diff --git a/core/lib/Foswiki/Configure/Checkers/Email/SSLCrlFile.pm b/core/lib/Foswiki/Configure/Checkers/Email/SSLCrlFile.pm
@@ -33,7 +33,8 @@ sub check_current_value {
     #                $guessed = 1;
     #            }
     #            elsif (
-    #                Foswiki::Configure::Load::expand(
+    #               # SMELL,  Must not modify config settings by expanding them
+    #                Foswiki::Configure::Load::expandValue(
     #                    $Foswiki::cfg{Email}{SSLCaFile}
     #                )
     #              )
@@ -73,8 +74,8 @@ sub check_current_value {
             $reporter->ERROR("$file is world-writable");
         }
     }
-    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/Meta.pm b/core/lib/Foswiki/Meta.pm
@@ -440,9 +440,9 @@ sub load {
     if ( ref($proto) ) {
 
         # Existing unloaded object
-        ASSERT( !$this->{_loadedRev} ) if DEBUG;
         $this = $proto;
-        $rev  = shift;
+        ASSERT( !$this->{_loadedRev} ) if DEBUG;
+        $rev = shift;
     }
     else {
         ( my $session, my $web, my $topic, $rev ) = @_;
@@ -2609,7 +2609,7 @@ sub removeFromStore {
     }
 
     if ( $attachment && !$this->hasAttachment($attachment) ) {
-        ASSERT( $this->{topic}, 'this is not a removable object' ) if DEBUG;
+        ASSERT( $this->{_topic}, 'this is not a removable object' ) if DEBUG;
         throw Error::Simple( 'No such attachment '
               . $this->{_web} . '.'
               . $this->{_topic} . '.'