// category treeview in "all" context shop fix

2012-02-29 10:15:23 +00:00
parent 7f55cb948b
commit 3994038d9e
1 changed files with 4 additions and 2 deletions
@@ -805,8 +805,10 @@ class CategoryCore extends ObjectModel
 			$sql .= '
 					AND cs.`id_shop` = '.(int)$shop->id;
 		$sql .= '
-					AND c.`id_parent` = '.(int)$id_parent.'
-				ORDER BY cs.`position` ASC';
+					AND c.`id_parent` = '.(int)$id_parent;
+		if (Shop::getContext() == Shop::CONTEXT_SHOP && $use_shop_context)
+			$sql .= '
+					ORDER BY cs.`position` ASC';
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
 	}