Content-Report-Table's space filtering is not enough restrictive #483

xwikisas · Feb 26, 2025 · 06c4448 · 06c4448
1 parent bbabe17
commit 06c4448
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/xwiki-pro-macros-ui/src/main/resources/Confluence/Macros/ContentReportTableMacro.xml b/xwiki-pro-macros-ui/src/main/resources/Confluence/Macros/ContentReportTableMacro.xml
@@ -339,8 +339,9 @@ The result is the following :
       #if($foreach.index &gt; 0)
         #set($statement = $statement + ' or ')
       #end
-      #set($statement = $statement + "doc.space like :space$foreach.index")
-      #set($discard = $params.put("space$foreach.index", $space.replaceAll('([%_!])', '!$1').concat('%')))
+      #set($spaceVar = "space$foreach.index")
+      #set($statement = $statement + "doc.space = :$spaceVar or doc.space like concat(:$spaceVar, '.%') or doc.space like concat('%.', :$spaceVar) or doc.space like concat('%.', :$spaceVar, '.%')")
+      #set($discard = $params.put($spaceVar, $space))
     #end
     #set($statement = $statement + ')')
   #end