dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// categories multishop improvements (BO breadcrumb + category tree root removed)

Browse Source
This commit is contained in:
vChabot
2012-01-23 14:50:47 +00:00
parent 7cbaf711be
commit 1e8d84fd0d
3 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Category.php
+6 -3
View File
@@ -671,8 +671,10 @@ class CategoryCore extends ObjectModel
if (is_null($id_lang))
$id_lang = $context->language->id;
if (!$shop)
$shop = $context->shop;
if (Shop::isFeatureActive() && $context->shop() != Shop::CONTEXT_SHOP)
$shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
else
$shop = $context->shop;
$is_more_than_one_root_category = count(Category::getCategoriesWithoutParent()) > 1;
if ((!Shop::isFeatureActive() && $is_more_than_one_root_category) ||
Shop::isFeatureActive() && $is_more_than_one_root_category && $context->shop() != Shop::CONTEXT_SHOP)
@@ -922,6 +924,7 @@ class CategoryCore extends ObjectModel
$categories = null;
$id_current = $this->id;
$context->shop = ($context->shop->id) ? $context->shop : new Shop(Configuration::get('PS_DEFAULT_SHOP'));
while (true)
{
$sql = '
@@ -953,7 +956,7 @@ class CategoryCore extends ObjectModel
$categories[] = $result[0];
else if (!$categories)
$categories = array();
if (!$result || ($result[0]['id_category'] == $context->shop->id_category && Shop::isFeatureActive()))
if (!$result || ($result[0]['id_category'] == $context->shop->id_category))
return $categories;
$id_current = $result[0]['id_parent'];
}