Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle

Conflicts: lib/upgrade.txt
2013-03-26 14:22:11 +08:00
parent 8af0dffb50 4e53188a4b
commit 0c241b980a
31 changed files with 3323 additions and 1007 deletions
@@ -32,11 +32,8 @@ class user_filter_courserole extends user_filter_type {
     */
    function get_course_categories() {
        global $CFG;
-        require_once($CFG->dirroot.'/course/lib.php');
-        $displaylist = array();
-        $parentlist = array();
-        make_categories_list($displaylist, $parentlist);
-        return array(0=> get_string('anycategory', 'filters')) + $displaylist;
+        require_once($CFG->libdir.'/coursecatlib.php');
+        return array(0=> get_string('anycategory', 'filters')) + coursecat::make_categories_list();
    }

    /**