// Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7842 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-02 09:54:23 +00:00
parent ab5fc723b4
commit c945049ef1
46 changed files with 370 additions and 357 deletions
@@ -56,7 +56,6 @@ class AdminFeatures extends AdminTab
 		else
 		{
 			parent::display();
-			$this->displayAssoGroupShop();
 		}
 	}

@@ -155,10 +154,10 @@ class AdminFeatures extends AdminTab
 		echo '
 					<div class="clear"></div>
 				</div>';
-				if (Tools::isMultiShopActivated())
+				if (Shop::isMultiShopActivated())
 				{
 					echo '<label>'.$this->l('GroupShop association:').'</label><div class="margin-form">';
-					$this->displayAssoGroupShop();
+					$this->displayAssoShop('group_shop');
 					echo '</div>';
 				}
 				echo '