Merge branch 'Release02x01'

foswiki · Aug 16, 2016 · ede8f79 · ede8f79
2 parents fe9f30a + 4990475
commit ede8f79
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/core/lib/Foswiki/Configure/FileUtil.pm b/core/lib/Foswiki/Configure/FileUtil.pm
@@ -416,7 +416,7 @@ sub checkTreePerms {
     if (   $perms =~ m/p/
         && $path =~ m/\Q$Foswiki::cfg{DataDir}\E\/(.+)$/
         && -d $path
-        && ( substr( $path, -4 ) ne ',pfv' ) )
+        && $path !~ m#,pfv# )
     {
         unless ( -e "$path/$Foswiki::cfg{WebPrefsTopicName}.txt" ) {
             unless ( $report{missingFile}++ > $options{maxMissingFile} ) {
@@ -459,7 +459,7 @@ sub checkTreePerms {
     opendir( my $Dfh, $path )
       or return "Directory $path is not readable.";
 
-    foreach my $e ( grep { !/^\./ } _readdir($Dfh) ) {
+    foreach my $e ( grep { !/^\.\.?$/ } _readdir($Dfh) ) {
         my $p = $path . '/' . $e;
         my $subreport = checkTreePerms( $p, $perms, %options );
         while ( my ( $k, $v ) = each %report ) {

diff --git a/core/tools/configure b/core/tools/configure
@@ -72,28 +72,29 @@ require Foswiki::Configure::Query;
 
         # Take out active elements
         $text =~ s/<(button|select|option|textarea).*?<\/\1>//g;
-        print $text;
+        print Encode::encode_utf8($text);
     }
 
     sub WARN {
         my $this = shift;
         $this->{warnings}++;
-        print "WARNING: ";
+        print Encode::encode_utf8("WARNING: ");
         $this->NOTE(@_);
     }
 
     sub ERROR {
         my $this = shift;
         $this->{errors}++;
-        print "#### ERROR: ";
+        print Encode::encode_utf8("#### ERROR: ");
         $this->NOTE(@_);
     }
 
     sub CHANGED {
         my ( $this, $k ) = @_;
         $this->SUPER::CHANGED($k);
 
-        print "\$Foswiki::cfg$k = $this->{changes}->{$k};\n";
+        print Encode::encode_utf8(
+            "\$Foswiki::cfg$k = $this->{changes}->{$k};\n");
     }
 
     sub WIZARD {