Merge pull request #5 from oveleon/develop

doishub · web-flow · commit 610ce934c7a1 · 2020-01-10T09:38:48.000+01:00
Fixing the creation of the styles class for recursive parsing of templates
diff --git a/src/Resources/contao/classes/StyleManager.php b/src/Resources/contao/classes/StyleManager.php
@@ -338,8 +338,11 @@ public static function deserializeValues($arrValue){
      */
     public function onParseTemplate($template)
     {
-        $arrStyles = \StringUtil::deserialize($template->styleManager);
-        $template->styleManager = new Styles(isset($arrStyles['__vars__']) ? $arrStyles['__vars__'] : null);
+        if(!($template->styleManager instanceof Styles))
+        {
+            $arrStyles = \StringUtil::deserialize($template->styleManager);
+            $template->styleManager = new Styles(isset($arrStyles['__vars__']) ? $arrStyles['__vars__'] : null);
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -338,8 +338,11 @@ public static function deserializeValues($arrValue){`
`338`	`338`	`*/`
`339`	`339`	`public function onParseTemplate($template)`
`340`	`340`	`{`
`341`		`- $arrStyles = \StringUtil::deserialize($template->styleManager);`
`342`		`- $template->styleManager = new Styles(isset($arrStyles['__vars__']) ? $arrStyles['__vars__'] : null);`
	`341`	`+ if(!($template->styleManager instanceof Styles))`
	`342`	`+ {`
	`343`	`+ $arrStyles = \StringUtil::deserialize($template->styleManager);`
	`344`	`+ $template->styleManager = new Styles(isset($arrStyles['__vars__']) ? $arrStyles['__vars__'] : null);`
	`345`	`+ }`
`343`	`346`	`}`
`344`	`347`
`345`	`348`	`/**`