Item14605: More unescaped { braces

foswiki · Jan 21, 2018 · 9ae136a · 9ae136a
1 parent a3d11f5
commit 9ae136a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/lib/Foswiki/Configure/Checkers/AccessibleCFG.pm b/core/lib/Foswiki/Configure/Checkers/AccessibleCFG.pm
@@ -23,7 +23,7 @@ sub check_current_value {
         if ( ref($v) ) {
             $reporter->ERROR("Was expecting entry $ec to be a scalar");
         }
-        if ( $v !~ /^({\w+})+$/ ) {
+        if ( $v !~ /^(\{\w+\})+$/ ) {
             $reporter->ERROR("Was expecting '$v' to be a cfg key");
         }
         $ec++;

diff --git a/core/lib/Foswiki/Configure/Checkers/WorkingDir.pm b/core/lib/Foswiki/Configure/Checkers/WorkingDir.pm
@@ -50,8 +50,8 @@ If compression is enabled, it also compresses the language file.
 sub onSave {
     my ( $this, $reporter, $key, $d, $old_dir ) = @_;
 
-    $d       =~ s/\$Foswiki::cfg({\w+})+/eval( "\$Foswiki::cfg$1")/ge;
-    $old_dir =~ s/\$Foswiki::cfg({\w+})+/eval( "\$Foswiki::cfg$1")/ge;
+    $d       =~ s/\$Foswiki::cfg(\{\w+\})+/eval( "\$Foswiki::cfg$1")/ge;
+    $old_dir =~ s/\$Foswiki::cfg(\{\w+\})+/eval( "\$Foswiki::cfg$1")/ge;
 
     return if ( $d eq $old_dir );
 
@@ -109,7 +109,7 @@ sub onSave {
 
     # Automatic upgrade of work_areas
     my $existing = $old_dir || $Foswiki::cfg{Store}{WorkAreaDir} || '';
-    $existing =~ s/\$Foswiki::cfg({\w+})+/eval( "$Foswiki::cfg$1")/ge;
+    $existing =~ s/\$Foswiki::cfg(\{\w+\})+/eval( "$Foswiki::cfg$1")/ge;
     if ( $existing && -d $existing ) {
 
         # Try and move the contents of the old workarea