Item13571: fixing empty results

foswiki · Jul 31, 2015 · 0773ca9 · 0773ca9
1 parent 056bafc
commit 0773ca9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,10 @@
+*.swp
+*,v
+*.gz
+FilesysVirtualPlugin.md5
+FilesysVirtualPlugin.sha1
+FilesysVirtualPlugin.tgz
+FilesysVirtualPlugin.txt
+FilesysVirtualPlugin.zip
+FilesysVirtualPlugin_installer
+FilesysVirtualPlugin_installer.pl
diff --git a/lib/Filesys/Virtual/Foswiki.pm b/lib/Filesys/Virtual/Foswiki.pm
@@ -246,15 +246,15 @@ sub _initSession {
 
 # Convert one or more strings from perl logical characters to the site encoding
 sub _logical2site {
-    return $@ if $Foswiki::UNICODE;
+    return @_ if $Foswiki::UNICODE;
     return
       map { Encode::encode( $Foswiki::cfg{Site}{CharSet} || 'iso-8859-1', $_ ) }
       @_;
 }
 
 # Convert one or more strings from the site encoding to perl logical characters
 sub _site2logical {
-    return $@ if $Foswiki::UNICODE;
+    return @_ if $Foswiki::UNICODE;
     return
       map { Encode::decode( $Foswiki::cfg{Site}{CharSet} || 'iso-8859-1', $_ ) }
       @_;
@@ -656,8 +656,12 @@ sub _getMode {
         }
     }
 
-    print STDERR "MODE /" . ( $web || '' ) . "/" . ( $topic || '' ) . "=$mode\n"
+    print STDERR "MODE /"
+      . ( $web   || '' ) . "/"
+      . ( $topic || '' )
+      . "=$mode\n"
       if ( $this->{trace} & 2 );
+
     return $mode;
 }