// little fix about categories with multishop and Helper::renderAdminCategorieTree

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12301 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vChabot
2012-01-10 10:29:53 +00:00
parent 0e6fd83ec2
commit 201c193dd4
5 changed files with 32 additions and 7 deletions
+2 -1
View File
@@ -491,10 +491,11 @@ class AdminShopControllerCore extends AdminController
public function initCategoriesAssociation($id_root = 1)
{
$id_shop = Tools::getValue('id_shop');
$shop = new Shop($id_shop);
$selected_cat = Shop::getCategories($id_shop);
if ($this->context->shop() == Shop::CONTEXT_SHOP && Tools::isSubmit('id_shop'))
$root_category = new Category($id_shop);
$root_category = new Category($shop->id_category);
else
$root_category = new Category($id_root);
$root_category = array('id_category' => $root_category->id_category, 'name' => $root_category->name[$this->context->language->id]);