From ed625e6cefff0c1e040d6984df71781b0a73979e Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 2 Oct 2012 07:59:44 +0000 Subject: [PATCH] [-] BO : fixed bug #PSCFV-4472 --- classes/Category.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/Category.php b/classes/Category.php index af1ed9390..7abc0eb50 100644 --- a/classes/Category.php +++ b/classes/Category.php @@ -778,14 +778,14 @@ class CategoryCore extends ObjectModel )' : '0').' AS nbSelectedSubCat FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category` '.Shop::addSqlRestrictionOnLang('cl', $id_shop).')'; - if (Shop::getContext() == Shop::CONTEXT_SHOP && $use_shop_context) - $sql .= ' LEFT JOIN `'._DB_PREFIX_.'category_shop` cs ON (c.`id_category` = cs.`id_category` AND cs.`id_shop` = '.(int)$id_shop.')'; + $sql .= ' LEFT JOIN `'._DB_PREFIX_.'category_shop` cs ON (c.`id_category` = cs.`id_category` AND cs.`id_shop` = '.(int)$id_shop.')'; $sql .= ' WHERE `id_lang` = '.(int)$id_lang; if (Shop::getContext() == Shop::CONTEXT_SHOP && $use_shop_context) $sql .= ' AND cs.`id_shop` = '.(int)$shop->id; $sql .= ' AND c.`id_parent` = '.(int)$id_parent; - if (Shop::getContext() == Shop::CONTEXT_SHOP && $use_shop_context) + if (!Shop::isFeatureActive() || Shop::getContext() == Shop::CONTEXT_SHOP && $use_shop_context) $sql .= ' ORDER BY cs.`position` ASC'; + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); }