// Remove $display_multishop_toolbar and add instead $multishop_context to manage shop context per admin controller

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13530 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 14:25:28 +00:00
parent 12735c9f50
commit 4e6628cbfd
15 changed files with 46 additions and 27 deletions
@@ -28,8 +28,6 @@

 class AdminShopControllerCore extends AdminController
 {
-	public $display_multishop_toolbar = false;
-
 	public function __construct()
 	{
 		$this->context = Context::getContext();
@@ -92,7 +90,10 @@ class AdminShopControllerCore extends AdminController
 				'submit' => array()
 			)
 		);
+
 		parent::__construct();
+
+		$this->multishop_context ^= Shop::CONTEXT_SHOP;
 	}

 	public function initToolbar()