New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compatibility issues with PHP 7.2 & PS 1.7.5 #42

Merged
merged 3 commits into from Sep 19, 2018
Jump to file or symbol
Failed to load files and symbols.
+3 −3
Diff settings

Always

Just for now

Viewing a subset of changes. View all

Fix issue with PHP 7.2 & LazyProduct

  • Loading branch information...
Quetzacoalt91 committed Sep 4, 2018
commit 0e6f07b4af3e087a5dcad3cb7ffd4cd6ee90f6f5
View
@@ -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';
@@ -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']);
}
ProTip! Use n and p to navigate between commits in a pull request.