Merge branch 'main' into import_export_autoincrement

Author: fballiano

app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php

@@ -567,7 +567,7 @@ public function checkProductBuyState($product = null)
                 if ($option->getIsRequire()) {
                     $customOption = $this->getProduct($product)
                         ->getCustomOption(self::OPTION_PREFIX . $option->getId());
-                    if (!$customOption || strlen($customOption->getValue()) == 0) {
+                    if (!$customOption || $customOption->getValue() === null || strlen($customOption->getValue()) === 0) {
                         $this->getProduct($product)->setSkipCheckRequiredOption(true);
                         Mage::throwException(
                             Mage::helper('catalog')->__('The product has required options')

app/code/core/Mage/Core/Helper/Abstract.php

@@ -250,6 +250,9 @@ function ($matches) {
      */
     public function stripTags($data, $allowableTags = null, $escape = false)
     {
+        if ($data === null) {
+            return '';
+        }
         $result = strip_tags($data, $allowableTags);
         return $escape ? $this->escapeHtml($result, $allowableTags) : $result;
     }