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

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17646 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-01 13:32:54 +00:00
parent ab59c5b8bb
commit c77a8fef96
2 changed files with 7 additions and 9 deletions
@@ -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)
 					{