diff --git a/cache/class_index.php b/cache/class_index.php index 2f02131f3..d14e58450 100644 --- a/cache/class_index.php +++ b/cache/class_index.php @@ -182,7 +182,6 @@ 'AdminStoresController' => 'override/controllers/admin/AdminStoresController.php', 'AdminStoresControllerCore' => 'controllers/admin/AdminStoresController.php', 'AdminSubDomainsController' => 'override/controllers/admin/AdminSubDomainsController.php', - 'AdminSubDomainsControllerCore' => 'controllers/admin/AdminSubDomainsController.php', 'AdminSuppliersController' => 'override/controllers/admin/AdminSuppliersController.php', 'AdminSuppliersControllerCore' => 'controllers/admin/AdminSuppliersController.php', 'AdminSupplyOrdersController' => 'override/controllers/admin/AdminSupplyOrdersController.php', @@ -581,7 +580,6 @@ 'StoresController' => 'override/controllers/front/StoresController.php', 'StoresControllerCore' => 'controllers/front/StoresController.php', 'SubDomain' => 'override/classes/SubDomain.php', - 'SubDomainCore' => 'classes/SubDomain.php', 'Supplier' => 'override/classes/Supplier.php', 'SupplierController' => 'override/controllers/front/SupplierController.php', 'SupplierControllerCore' => 'controllers/front/SupplierController.php', diff --git a/classes/Module.php b/classes/Module.php index fcec05f8d..d3c35d101 100644 --- a/classes/Module.php +++ b/classes/Module.php @@ -1021,21 +1021,20 @@ abstract class ModuleCore $item->author = $tmp_module->author; $item->limited_countries = $tmp_module->limited_countries; $item->parent_class = get_parent_class($module); - $item->is_configurable = method_exists($tmp_module, 'getContent') ? 1 : 0; + $item->is_configurable = $tmp_module->is_configurable = method_exists($tmp_module, 'getContent') ? 1 : 0; $item->need_instance = isset($tmp_module->need_instance) ? $tmp_module->need_instance : 0; $item->active = $tmp_module->active; $item->currencies = isset($tmp_module->currencies) ? $tmp_module->currencies : null; $item->currencies_mode = isset($tmp_module->currencies_mode) ? $tmp_module->currencies_mode : null; - unset($tmp_module); $module_list[] = $item; if (!$xml_exist || $needNewConfigFile) { self::$_generate_config_xml_mode = true; - $tmp_module = new $module; $tmp_module->_generateConfigXml(); self::$_generate_config_xml_mode = false; } + unset($tmp_module); } else $errors[] = sprintf(Tools::displayError('%1$s (class missing in %2$s)'), $module, substr($filepath, strlen(_PS_ROOT_DIR_))); diff --git a/modules/blocklayered/config.xml b/modules/blocklayered/config.xml index 1ffdeb5ad..5b0d6d050 100644 --- a/modules/blocklayered/config.xml +++ b/modules/blocklayered/config.xml @@ -1,9 +1,9 @@ blocklayered - + - + 1 diff --git a/modules/statsbestproducts/config.xml b/modules/statsbestproducts/config.xml index 87fa66809..76e5607f8 100755 --- a/modules/statsbestproducts/config.xml +++ b/modules/statsbestproducts/config.xml @@ -1,12 +1,12 @@ - - statsbestproducts - - - - - - 0 - 0 + + statsbestproducts + + + + + + 0 + 0 - \ No newline at end of file + \ No newline at end of file