diff --git a/classes/Product.php b/classes/Product.php index 5ae0fe63d..66c238744 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -5393,7 +5393,7 @@ class ProductCore extends ObjectModel return $this->id_tax_rules_group; } - public static function getIdTaxRulesGroupByIdProduct($id_product, Context $context = null) + public static function getIdTaxRulesGroupByIdProduct($id_product, ?Context $context = null) { if (!$context) { $context = Context::getContext(); diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index c834f63e1..8df7782af 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -1260,7 +1260,7 @@ class AdminModulesControllerCore extends AdminController $filter_categories = []; if (Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee)) { $filter_categories = explode('|', Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee)); - + } if (count($category_filtered) > 0 && !isset($category_filtered[$module->tab])) { return true; } diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index f8c205a89..3b092d799 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -6223,7 +6223,7 @@ class AdminOrdersControllerCore extends AdminController 1, 1, 0, - l, + null, 0, $idHotelBooking ); @@ -6239,7 +6239,7 @@ class AdminOrdersControllerCore extends AdminController 1, 0, 0, - l, + null, 0, $idHotelBooking ); diff --git a/install/upgrade/php/migrate_tabs_15.php b/install/upgrade/php/migrate_tabs_15.php index 19f2345a0..24a5a479d 100644 --- a/install/upgrade/php/migrate_tabs_15.php +++ b/install/upgrade/php/migrate_tabs_15.php @@ -166,7 +166,6 @@ function migrate_tabs_15() $sql = 'SELECT id_tab FROM '._DB_PREFIX_.'tab WHERE id_tab NOT IN ('.implode(', ', $parent).') AND id_parent = 0'; - $id_tabs = Db::getInstance()->executeS($sql); if (is_array($id_tabs) && count($id_tabs)) { foreach (Db::getInstance()->executeS($sql) as $row) {