From b71fee03d164dd9052722f13175fa17b1a56c77f Mon Sep 17 00:00:00 2001 From: vChabot Date: Sat, 19 May 2012 12:23:58 +0000 Subject: [PATCH] [-] BO : BugFix : #PSCFV-2440 : Impossible to delete a shop with share option git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15431 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/controller/AdminController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 789545bc2..7cd134a54 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -1693,7 +1693,7 @@ class AdminControllerCore extends Controller Shop::setContext(Shop::CONTEXT_SHOP, $shop_id); } } - else if ($this->context->employee->hasAuthOnShop($split[1])) + else if (Shop::getShop($split[1]) && $this->context->employee->hasAuthOnShop($split[1])) { $shop_id = $split[1]; Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);