Merge branch 'main' into phpunit-pre-symfony

sreichel · web-flow · commit 3ca8ce3c6011 · 2025-04-22T20:44:17.000+02:00
diff --git a/app/code/core/Mage/Newsletter/Model/Template.php b/app/code/core/Mage/Newsletter/Model/Template.php
@@ -175,7 +175,7 @@ public function getTemplateTextPreprocessed()
             $this->setTemplateTextPreprocessed($this->getProcessedTemplate());
         }
 
-        return $this->getData('template_text_preprocessed');
+        return (string) $this->getData('template_text_preprocessed');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public function getTemplateTextPreprocessed()`
`175`	`175`	`$this->setTemplateTextPreprocessed($this->getProcessedTemplate());`
`176`	`176`	`}`
`177`	`177`
`178`		`- return $this->getData('template_text_preprocessed');`
	`178`	`+ return (string) $this->getData('template_text_preprocessed');`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`/**`