Merge branch 'main' into om-tinymce

OpenMage · Nov 16, 2023 · 18620ec · 18620ec
2 parents 164e298 + b64754d
commit 18620ec
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php
@@ -761,7 +761,7 @@ protected function _getAttributeValue($attributeId, $value, $storeId)
             }
         }
 
-        $value = preg_replace("#\s+#siu", ' ', trim(strip_tags($value)));
+        $value = $value === null ? '' : preg_replace("#\s+#siu", ' ', trim(strip_tags($value)));
 
         return $value;
     }