Update/fix

OpenMage · Jan 5, 2023 · 5650cdd · 5650cdd
1 parent 9dd210d
commit 5650cdd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/code/core/Mage/Newsletter/Model/Template.php b/app/code/core/Mage/Newsletter/Model/Template.php
@@ -167,7 +167,7 @@ public function getType()
      */
     public function isPreprocessed()
     {
-        return $this->getTemplateTextPreprocessed() !== '';
+        return strlen($this->getTemplateTextPreprocessed()) > 0;
     }
 
     /**
@@ -181,7 +181,7 @@ public function getTemplateTextPreprocessed()
             $this->setTemplateTextPreprocessed($this->getProcessedTemplate());
         }
 
-        return $this->getData('template_text_preprocessed');
+        return (string) $this->getData('template_text_preprocessed');
     }
 
     /**

diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php
@@ -79,7 +79,7 @@ public function setValidationFilter($websiteId, $customerGroupId, $couponCode =
             $select = $this->getSelect();
 
             $connection = $this->getConnection();
-            if ($couponCode !== '') {
+            if (is_string($couponCode) && strlen($couponCode)) {
                 $select->joinLeft(
                     ['rule_coupons' => $this->getTable('salesrule/coupon')],
                     $connection->quoteInto(