diff --git a/classes/ImportModule.php b/classes/ImportModule.php index 7b7223933..5e6295e9e 100644 --- a/classes/ImportModule.php +++ b/classes/ImportModule.php @@ -81,7 +81,7 @@ abstract class ImportModuleCore extends Module { $modules = Module::getModulesOnDisk(true); foreach ($modules as $key => $module) - if (get_parent_class($module) != 'ImportModule') + if (!isset($module->parent_class) || $module->parent_class != 'ImportModule') unset($modules[$key]); return $modules; } diff --git a/classes/Module.php b/classes/Module.php index 9f82126e4..e3958dcc3 100644 --- a/classes/Module.php +++ b/classes/Module.php @@ -1020,7 +1020,8 @@ abstract class ModuleCore $item->description = $tmp_module->description; $item->author = $tmp_module->author; $item->limited_countries = $tmp_module->limited_countries; - $item->is_configurable = isset($tmp_module->is_configurable) ? $tmp_module->is_configurable : 1; + $item->parent_class = get_parent_class($module); + $item->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; @@ -1095,6 +1096,7 @@ abstract class ModuleCore $item->description = strip_tags((string)$modaddons->description); $item->author = strip_tags((string)$modaddons->author); $item->limited_countries = array(); + $item->parent_class = ''; $item->is_configurable = 0; $item->need_instance = 0; $item->not_on_disk = 1; @@ -1540,7 +1542,7 @@ abstract class ModuleCore description).']]> author).']]> tab).']]>'.(isset($this->confirmUninstall) ? "\n\t".''.$this->confirmUninstall.'' : '').' - '.(int)method_exists($this, 'getContent').' + '.(int)$this->is_configurable.' '.(int)$this->need_instance.''.(isset($this->limited_countries) ? "\n\t".''.(count($this->limited_countries) == 1 ? $this->limited_countries[0] : '').'' : '').' '; if (is_writable(_PS_MODULE_DIR_.$this->name.'/')) diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 0a3ae3a4e..2e60e84b5 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -815,7 +815,7 @@ class AdminModulesControllerCore extends AdminController if ($module->id && $module->active) $return .= (!empty($result) ? '|' : '').' '.$this->translationsTab['Reset'].''; - if ($module->id && (method_exists($module, 'getContent') || (isset($module->is_configurable) && $module->is_configurable))) + if ($module->id && isset($module->is_configurable) && $module->is_configurable) $return .= (!empty($result) ? '|' : '').' '.$this->translationsTab['Configure'].''; $hrefDelete = self::$currentIndex.'&delete='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.urlencode($module->name); diff --git a/modules/gsitemap/config.xml b/modules/gsitemap/config.xml index 33f7a8401..a3ecba150 100755 --- a/modules/gsitemap/config.xml +++ b/modules/gsitemap/config.xml @@ -6,7 +6,7 @@ - 1 + 0 0 \ No newline at end of file