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

Merge pull request #1121 from dlage/patch-1

Browse Source 
[-] BO : fixed bug loading wrong root category in AdminCategoriesController
This commit is contained in:
Gregory Roussac committed 2013-12-11 03:00:00 -08:00
2 parents fd1050b0db b4c4068e41
commit 445b5e9b99
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCategoriesController.php
+1 -1
View File
@@ -105,7 +105,7 @@ class AdminCategoriesControllerCore extends AdminController
$this->_category = new Category($id_category); $this->_category = new Category($id_category);
else else
{ {
if (Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP) if (Shop::getContext() == Shop::CONTEXT_SHOP)
$this->_category = new Category($this->context->shop->id_category); $this->_category = new Category($this->context->shop->id_category);
elseif (count(Category::getCategoriesWithoutParent()) > 1 && Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE') && count(Shop::getShops(true, null, true)) != 1) elseif (count(Category::getCategoriesWithoutParent()) > 1 && Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE') && count(Shop::getShops(true, null, true)) != 1)
$this->_category = Category::getTopCategory(); $this->_category = Category::getTopCategory();