dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : Fixing a bug on config module file generation

Browse Source
This commit is contained in:
fSerny
2012-03-13 15:48:29 +00:00
parent f52d86fad6
commit b96e420031
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cache/class_index.php
Vendored
-2
View File
@@ -182,7 +182,6 @@
'AdminStoresController' => 'override/controllers/admin/AdminStoresController.php', 'AdminStoresController' => 'override/controllers/admin/AdminStoresController.php',
'AdminStoresControllerCore' => 'controllers/admin/AdminStoresController.php', 'AdminStoresControllerCore' => 'controllers/admin/AdminStoresController.php',
'AdminSubDomainsController' => 'override/controllers/admin/AdminSubDomainsController.php', 'AdminSubDomainsController' => 'override/controllers/admin/AdminSubDomainsController.php',
'AdminSubDomainsControllerCore' => 'controllers/admin/AdminSubDomainsController.php',
'AdminSuppliersController' => 'override/controllers/admin/AdminSuppliersController.php', 'AdminSuppliersController' => 'override/controllers/admin/AdminSuppliersController.php',
'AdminSuppliersControllerCore' => 'controllers/admin/AdminSuppliersController.php', 'AdminSuppliersControllerCore' => 'controllers/admin/AdminSuppliersController.php',
'AdminSupplyOrdersController' => 'override/controllers/admin/AdminSupplyOrdersController.php', 'AdminSupplyOrdersController' => 'override/controllers/admin/AdminSupplyOrdersController.php',
@@ -581,7 +580,6 @@
'StoresController' => 'override/controllers/front/StoresController.php', 'StoresController' => 'override/controllers/front/StoresController.php',
'StoresControllerCore' => 'controllers/front/StoresController.php', 'StoresControllerCore' => 'controllers/front/StoresController.php',
'SubDomain' => 'override/classes/SubDomain.php', 'SubDomain' => 'override/classes/SubDomain.php',
'SubDomainCore' => 'classes/SubDomain.php',
'Supplier' => 'override/classes/Supplier.php', 'Supplier' => 'override/classes/Supplier.php',
'SupplierController' => 'override/controllers/front/SupplierController.php', 'SupplierController' => 'override/controllers/front/SupplierController.php',
'SupplierControllerCore' => 'controllers/front/SupplierController.php', 'SupplierControllerCore' => 'controllers/front/SupplierController.php',
classes/Module.php
+2 -3
View File
@@ -1021,21 +1021,20 @@ abstract class ModuleCore
$item->author = $tmp_module->author; $item->author = $tmp_module->author;
$item->limited_countries = $tmp_module->limited_countries; $item->limited_countries = $tmp_module->limited_countries;
$item->parent_class = get_parent_class($module); $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->need_instance = isset($tmp_module->need_instance) ? $tmp_module->need_instance : 0;
$item->active = $tmp_module->active; $item->active = $tmp_module->active;
$item->currencies = isset($tmp_module->currencies) ? $tmp_module->currencies : null; $item->currencies = isset($tmp_module->currencies) ? $tmp_module->currencies : null;
$item->currencies_mode = isset($tmp_module->currencies_mode) ? $tmp_module->currencies_mode : null; $item->currencies_mode = isset($tmp_module->currencies_mode) ? $tmp_module->currencies_mode : null;
unset($tmp_module);
$module_list[] = $item; $module_list[] = $item;
if (!$xml_exist || $needNewConfigFile) if (!$xml_exist || $needNewConfigFile)
{ {
self::$_generate_config_xml_mode = true; self::$_generate_config_xml_mode = true;
$tmp_module = new $module;
$tmp_module->_generateConfigXml(); $tmp_module->_generateConfigXml();
self::$_generate_config_xml_mode = false; self::$_generate_config_xml_mode = false;
} }
unset($tmp_module);
} }
else else
$errors[] = sprintf(Tools::displayError('%1$s (class missing in %2$s)'), $module, substr($filepath, strlen(_PS_ROOT_DIR_))); $errors[] = sprintf(Tools::displayError('%1$s (class missing in %2$s)'), $module, substr($filepath, strlen(_PS_ROOT_DIR_)));
modules/blocklayered/config.xml
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<module> <module>
<name>blocklayered</name> <name>blocklayered</name>
<displayName><![CDATA[Layered navigation block]]></displayName> <displayName><![CDATA[Bloc navigation &agrave; facettes]]></displayName>
<version><![CDATA[1.8.1]]></version> <version><![CDATA[1.8.1]]></version>
<description><![CDATA[Displays a block with layered navigation filters.]]></description> <description><![CDATA[Affiche un bloc avec les filtres de la navigation &agrave; facettes]]></description>
<author><![CDATA[PrestaShop]]></author> <author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab> <tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable> <is_configurable>1</is_configurable>
modules/statsbestproducts/config.xml
+10 -10
View File
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<module> <module>
<name>statsbestproducts</name> <name>statsbestproducts</name>
<displayName><![CDATA[Best products]]></displayName> <displayName><![CDATA[Best products]]></displayName>
<version><![CDATA[1]]></version> <version><![CDATA[1]]></version>
<description><![CDATA[A list of the best products]]></description> <description><![CDATA[A list of the best products]]></description>
<author><![CDATA[PrestaShop]]></author> <author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[analytics_stats]]></tab> <tab><![CDATA[analytics_stats]]></tab>
<is_configurable>0</is_configurable> <is_configurable>0</is_configurable>
<need_instance>0</need_instance> <need_instance>0</need_instance>
<limited_countries></limited_countries> <limited_countries></limited_countries>
</module> </module>