Merge pull request #336 from magento-obsessive-owls/PB-272

davemacaulay · web-flow · commit ac2fe7e9182f · 2019-11-21T11:41:50.000-06:00
[Owls] [PB-1.1.1 Backport] Enable strict mode for template filtering
diff --git a/app/code/Magento/PageBuilder/Model/Stage/Renderer/WidgetDirective.php b/app/code/Magento/PageBuilder/Model/Stage/Renderer/WidgetDirective.php
@@ -67,9 +67,11 @@ public function render(array $params): array
         }
 
         try {
+            $previousStrictMode = $this->directiveFilter->setStrictMode(true);
             $result['content'] = $this->directiveFilter
                 ->setStoreId(Store::DEFAULT_STORE_ID)
                 ->filter($this->templateFilter->filter($params['directive']));
+            $this->directiveFilter->setStrictMode($previousStrictMode);
         } catch (\Exception $e) {
             $result['error'] = __($e->getMessage());
         }

Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,11 @@ public function render(array $params): array`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`try {`
	`70`	`+ $previousStrictMode = $this->directiveFilter->setStrictMode(true);`
`70`	`71`	`$result['content'] = $this->directiveFilter`
`71`	`72`	`->setStoreId(Store::DEFAULT_STORE_ID)`
`72`	`73`	`->filter($this->templateFilter->filter($params['directive']));`
	`74`	`+ $this->directiveFilter->setStrictMode($previousStrictMode);`
`73`	`75`	`} catch (\Exception $e) {`
`74`	`76`	`$result['error'] = __($e->getMessage());`
`75`	`77`	`}`