Item13776: More braces need escaping

foswiki · Oct 2, 2015 · a1daad6 · a1daad6
1 parent de2d949
commit a1daad6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/core/lib/Foswiki/Query/HoistREs.pm b/core/lib/Foswiki/Query/HoistREs.pm
@@ -258,7 +258,7 @@ sub _hoistDOT {
                     node  => 'text',
                     regex => '^%'
                       . $lhs
-                      . '{.*\\b'
+                      . '\\{.*\\b'
                       . $rhs
                       . "=\\\"\000RHS\001\\\""
                 };
@@ -274,7 +274,7 @@ sub _hoistDOT {
                 return {
                     node => 'text',
                     regex =>
-"^%META:FIELD{name=\\\"$rhs\\\".*\\bvalue=\\\"\000RHS\001\\\""
+"^%META:FIELD\\{name=\\\"$rhs\\\".*\\bvalue=\\\"\000RHS\001\\\""
                 };
             }
 
@@ -303,7 +303,7 @@ sub _hoistDOT {
             return {
                 node => 'text',
                 regex =>
-"^%META:FIELD{name=\\\"$node->{params}[0]\\\".*\\bvalue=\\\"\0RHS\1\\\""
+"^%META:FIELD\\{name=\\\"$node->{params}[0]\\\".*\\bvalue=\\\"\0RHS\1\\\""
             };
         }
     }

diff --git a/core/lib/Foswiki/Store/SearchAlgorithms/Forking.pm b/core/lib/Foswiki/Store/SearchAlgorithms/Forking.pm
@@ -41,16 +41,16 @@ sub search {
     }
 
     if ( $options->{casesensitive} ) {
-        $program =~ s/%CS{(.*?)\|.*?}%/$1/g;
+        $program =~ s/%CS\{(.*?)\|.*?\}%/$1/g;
     }
     else {
-        $program =~ s/%CS{.*?\|(.*?)}%/$1/g;
+        $program =~ s/%CS\{.*?\|(.*?)\}%/$1/g;
     }
     if ( $options->{files_without_match} ) {
-        $program =~ s/%DET{.*?\|(.*?)}%/$1/g;
+        $program =~ s/%DET\{.*?\|(.*?)\}%/$1/g;
     }
     else {
-        $program =~ s/%DET{(.*?)\|.*?}%/$1/g;
+        $program =~ s/%DET\{(.*?)\|.*?\}%/$1/g;
     }
     if ( $options->{wordboundaries} ) {