From cf51d8372e993db7ecf2503d6f5b004b012b7819 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 30 Aug 2012 13:44:56 +0000 Subject: [PATCH] [-] BO : fixed bug #PSCFV-3806 - fixed bug when unchecked all shop asso you can't access to item any more. git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17098 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/controller/AdminController.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 6600f5821..9ec2fed30 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2011,16 +2011,15 @@ class AdminControllerCore extends Controller if ($this->multishop_context && Shop::isTableAssociated($this->table) && !empty($this->className)) { - if (Shop::getContext() != Shop::CONTEXT_ALL || Shop::isTableAssociated($this->table) || !$this->context->employee->isSuperAdmin()) + if (Shop::getContext() != Shop::CONTEXT_ALL || !$this->context->employee->isSuperAdmin()) { - $identifier_shop = Shop::getContextListShopID(); $test_join = !preg_match('#`?'.preg_quote(_DB_PREFIX_.$this->table.'_shop').'`? *sa#', $this->_join); - if (Shop::isFeatureActive() && $test_join) + if (Shop::isFeatureActive() && $test_join && Shop::isTableAssociated($this->table)) { $this->_where .= ' AND a.'.$this->identifier.' IN ( SELECT sa.'.$this->identifier.' FROM `'._DB_PREFIX_.$this->table.'_shop` sa - WHERE sa.id_shop IN ('.implode(', ', $identifier_shop).') + WHERE sa.id_shop IN ('.implode(', ', Shop::getContextListShopID()).') )'; } }