Item13455: Don't encode filenames read from directories

foswiki · Jun 13, 2015 · 2ece92b · 2ece92b
1 parent 8b314fa
commit 2ece92b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/PlainFileStoreContrib/lib/Foswiki/Store/PlainFile.pm b/PlainFileStoreContrib/lib/Foswiki/Store/PlainFile.pm
@@ -782,14 +782,14 @@ sub remove {
 
         # Topic or attachment
         _unlink( _latestFile( $meta, $attachment ) );
-        _rmtree( _historyDir( $meta, $attachment ) );
-        _rmtree( _getPub($meta) ) unless ($attachment);    # topic only
+        _rmtree( _encode( _historyDir( $meta, $attachment ) ) );
+        _rmtree( _encode( _getPub($meta) ) ) unless ($attachment);  # topic only
     }
     else {
 
         # Web
-        _rmtree( _getData($meta) );
-        _rmtree( _getPub($meta) );
+        _rmtree( _encode( _getData($meta) ) );
+        _rmtree( _encode( _getPub($meta) ) );
     }
 
     return unless ( $Foswiki::Store::STORE_FORMAT_VERSION < 1.2 );
@@ -1438,7 +1438,7 @@ sub _mkPathTo {
 
 # Remove an entire directory tree. $root must be encoded.
 sub _rmtree {
-    my $root = _encode(shift);
+    my $root = shift;
     my $D;
     if ( opendir( $D, $root ) ) {