Merge pull request #43 from PrestaShop/dev

Deploying v3.0.1 of ps_legalcompliance

config.xml

@@ -2,7 +2,7 @@
 <module>
   <name>ps_legalcompliance</name>
   <displayName><![CDATA[Legal Compliance]]></displayName>
-  <version><![CDATA[3.0.0]]></version>
+  <version><![CDATA[3.0.1]]></version>
   <description><![CDATA[This module helps merchants in getting compliant with applicable e-commerce law.]]></description>
   <author><![CDATA[PrestaShop]]></author>
   <tab><![CDATA[administration]]></tab>

ps_legalcompliance.php

@@ -45,8 +45,8 @@ class Ps_LegalCompliance extends Module
     protected $entity_manager;
     protected $filesystem;
     protected $emails;
-    protected $_errors;
-    protected $_warnings;
+    protected $_errors = array();
+    protected $_warnings = array();
 
     /* Constants used for LEGAL/CMS Management */
     const LEGAL_NO_ASSOC = 'NO_ASSOC';
@@ -64,7 +64,7 @@ public function __construct(EntityManager $entity_manager,
     {
         $this->name = 'ps_legalcompliance';
         $this->tab = 'administration';
-        $this->version = '3.0.0';
+        $this->version = '3.0.1';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
         $this->bootstrap = true;
@@ -860,7 +860,7 @@ public function hookDisplayProductPriceBlock($param)
         $product = $param['product'];
         $hook_type = $param['type'];
 
-        if (is_array($product)) {
+        if (! $product instanceof Product) {
             $product_repository = $this->entity_manager->getRepository('Product');
             $product = $product_repository->findOne((int) $product['id_product']);
         }