Merge pr #1285 from @zonky2

discordier · discordier · commit b68593be1937 · 2019-03-08T21:46:46.000+01:00
Changes the prefix for page template from "fe_page" to only "fe_"
when rendering "clear all" filters.
diff --git a/src/FrontendIntegration/FrontendFilter.php b/src/FrontendIntegration/FrontendFilter.php
@@ -533,7 +533,7 @@ protected function generateElement($table, $content, $replace, $elementId)
      */
     public function generateClearAll($strContent, $strTemplate)
     {
-        if (substr($strTemplate, 0, 7) === 'fe_page') {
+        if (substr($strTemplate, 0, 3) === 'fe_') {
             if (preg_match_all(
                 '#\[\[\[metamodelfrontendfilterclearall::(ce|mod)::([^\]]*)\]\]\]#',
                 $strContent,

Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ protected function generateElement($table, $content, $replace, $elementId)`
`533`	`533`	`*/`
`534`	`534`	`public function generateClearAll($strContent, $strTemplate)`
`535`	`535`	`{`
`536`		`- if (substr($strTemplate, 0, 7) === 'fe_page') {`
	`536`	`+ if (substr($strTemplate, 0, 3) === 'fe_') {`
`537`	`537`	`if (preg_match_all(`
`538`	`538`	`'#\[\[\[metamodelfrontendfilterclearall::(ce\|mod)::([^\]]*)\]\]\]#',`
`539`	`539`	`$strContent,`