L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-MDL-33066-m23' of git://github.com/samhemelryk/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2012-05-22 10:30:36 +08:00
parent 2a4fbc327c 957983b702
commit c8f0f2cd85
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/navigationlib.php
+2 -2
View File
@@ -1722,7 +1722,7 @@ class global_navigation extends navigation_node {
FROM {course_categories} cc
JOIN {context} ctx ON cc.id = ctx.instanceid";
$sqlwhere = "WHERE ctx.contextlevel = ".CONTEXT_COURSECAT;
$sqlorder = "ORDER BY depth ASC, sortorder ASC, id ASC";
$sqlorder = "ORDER BY cc.depth ASC, cc.sortorder ASC, cc.id ASC";
$params = array();
$categoriestoload = array();
@@ -2931,7 +2931,7 @@ class global_navigation_for_ajax extends global_navigation {
JOIN {context} ctx ON cc.id = ctx.instanceid
WHERE ctx.contextlevel = ".CONTEXT_COURSECAT." AND
(cc.id = :categoryid1 OR cc.parent = :categoryid2)
ORDER BY depth ASC, sortorder ASC, id ASC";
ORDER BY cc.depth ASC, cc.sortorder ASC, cc.id ASC";
$params = array('categoryid1' => $categoryid, 'categoryid2' => $categoryid);
$categories = $DB->get_recordset_sql($sql, $params, 0, $limit);
$subcategories = array();