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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
gRoussac
2013-07-03 15:06:05 +02:00
parent ae0299a6eb afda9cdd94
commit 36e3956267
57 changed files with 4548 additions and 4434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockmanufacturer/blockmanufacturer.php
+1 -1
View File
@@ -48,7 +48,7 @@ class BlockManufacturer extends Module
Configuration::updateValue('MANUFACTURER_DISPLAY_TEXT', true);
Configuration::updateValue('MANUFACTURER_DISPLAY_TEXT_NB', 5);
Configuration::updateValue('MANUFACTURER_DISPLAY_FORM', true);
return parent::install() &&
return parent::install() &&
$this->registerHook('leftColumn') &&
$this->registerHook('header') &&
$this->registerHook('actionObjectManufacturerDeleteAfter') &&
modules/pscleaner/pscleaner.php
+3 -3
View File
@@ -175,9 +175,9 @@ class PSCleaner extends Module
array('delivery', 'id_carrier', 'carrier', 'id_carrier'),
array('delivery', 'id_zone', 'zone', 'id_zone'),
array('editorial', 'id_shop', 'shop', 'id_shop', 'editorial'),
array('favorite_product', 'id_product', 'product', 'id_product'),
array('favorite_product', 'id_customer', 'customer', 'id_customer'),
array('favorite_product', 'id_shop', 'shop', 'id_shop'),
array('favorite_product', 'id_product', 'product', 'id_product','favoriteproducts'),
array('favorite_product', 'id_customer', 'customer', 'id_customer','favoriteproducts'),
array('favorite_product', 'id_shop', 'shop', 'id_shop','favoriteproducts'),
array('feature_product', 'id_feature', 'feature', 'id_feature'),
array('feature_product', 'id_product', 'product', 'id_product'),
array('feature_value', 'id_feature', 'feature', 'id_feature'),