Item13442: minor tweaks

foswiki · Jun 4, 2015 · b128469 · b128469
1 parent f14e681
commit b128469
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/lib/Foswiki/Contrib/CharsetConverterContrib.pm b/lib/Foswiki/Contrib/CharsetConverterContrib.pm
@@ -112,13 +112,12 @@ sub _convert_string {
 
 sub _rename {
     my ( $from, $to ) = @_;
-    my $uto = Encode::decode_utf8($to);
-    report "Move $uto";
+    report "Move $from";
     $moveCount++;
     $renameCount++ if ( $from ne $to );
     return if ( $options->{-i} );
     File::Copy::move( $from, $to )
-      || error "Failed to rename $uto: $!";
+      || error "Failed to rename $from: $!";
 }
 
 =begin TML
@@ -165,7 +164,7 @@ sub _rename_collection {
     my $dir;
 
     my $webpath = $tree . '/' . $web . '/';
-    next unless -d $webpath;
+    return unless -d $webpath;
     my %rename;
     my @subcoll;
     opendir( $dir, $webpath ) || die "Failed to open '$webpath' $!";