// category treeview in "all" context shop fix

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13728 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vChabot committed 2012-02-29 10:15:23 +00:00
1 parent 96d1d902e7
commit 8a42a9a74a
1 file changed
+4 -2
+4 -2
View File
@@ -805,8 +805,10 @@ class CategoryCore extends ObjectModel
$sql .= ' $sql .= '
AND cs.`id_shop` = '.(int)$shop->id; AND cs.`id_shop` = '.(int)$shop->id;
$sql .= ' $sql .= '
AND c.`id_parent` = '.(int)$id_parent.' AND c.`id_parent` = '.(int)$id_parent;
ORDER BY cs.`position` ASC'; if (Shop::getContext() == Shop::CONTEXT_SHOP && $use_shop_context)
$sql .= '
ORDER BY cs.`position` ASC';
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
} }