Merge branch 'hotfix/3.7.4'

Nosto · Jul 18, 2018 · 5c7ffee · 5c7ffee
2 parents 88906f7 + 6d5a087
commit 5c7ffee
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.
 
+### 3.7.4
+* Add explicit boolean check for product building
+
 ### 3.7.3
 * Add missing hcid from customer block and cart meta
 

diff --git a/app/code/community/Nosto/Tagging/Block/Product.php b/app/code/community/Nosto/Tagging/Block/Product.php
@@ -59,7 +59,12 @@ protected function _toHtml()
         ) {
             return '';
         }
-        return $this->getMetaProduct()->toHtml();
+        $nostoProduct = $this->getMetaProduct();
+        if ($nostoProduct instanceof Nosto_AbstractObject) {
+            return $nostoProduct->toHtml();
+        } else {
+            return '';
+        }
     }
 
     /**

diff --git a/app/code/community/Nosto/Tagging/Model/Meta/Product/Builder.php b/app/code/community/Nosto/Tagging/Model/Meta/Product/Builder.php
@@ -74,7 +74,7 @@ public static function build(
         }
 
         $nostoProduct = Mage::getModel('nosto_tagging/meta_product');
-        if (!$nostoProduct->loadData($product, $store)) {
+        if ($nostoProduct->loadData($product, $store) === false) {
             return null;
         }
 

diff --git a/app/code/community/Nosto/Tagging/etc/config.xml b/app/code/community/Nosto/Tagging/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Nosto_Tagging>
-            <version>3.7.3</version>
+            <version>3.7.4</version>
         </Nosto_Tagging>
     </modules>
     <global>