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

[-] BO : features are not doubled anymore in multishop #PSCFV-4527

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17646 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-10-01 13:32:54 +00:00
parent ab59c5b8bb
commit c77a8fef96
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
classes/Feature.php
View File

@@ -79,16 +79,14 @@ class FeatureCore extends ObjectModel
* @return array Multiple arrays with feature's data
* @static
*/
public static function getFeatures($id_lang)
public static function getFeatures($id_lang, $with_shop = true)
{
return Db::getInstance()->executeS('
SELECT *
FROM `'._DB_PREFIX_.'feature` f
'.Shop::addSqlAssociation('feature', 'f').'
LEFT JOIN `'._DB_PREFIX_.'feature_lang` fl
ON (f.`id_feature` = fl.`id_feature` AND fl.`id_lang` = '.(int)$id_lang.')
ORDER BY f.`position` ASC
');
SELECT *
FROM `'._DB_PREFIX_.'feature` f
'.($with_shop ? Shop::addSqlAssociation('feature', 'f') : '').'
LEFT JOIN `'._DB_PREFIX_.'feature_lang` fl ON (f.`id_feature` = fl.`id_feature` AND fl.`id_lang` = '.(int)$id_lang.')
ORDER BY f.`position` ASC');
}
/**

2
controllers/admin/AdminProductsController.php
View File

@@ -3911,7 +3911,7 @@ class AdminProductsControllerCore extends AdminController
{
if ($this->product_exists_in_shop)
{
$features = Feature::getFeatures($this->context->language->id);
$features = Feature::getFeatures($this->context->language->id, (Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP));
foreach ($features as $k => $tab_features)
{