Merge branch 'MDL-47012-m' of git://github.com/micaherne/moodle

This commit is contained in:
Marina Glancy 2014-09-09 17:16:15 +08:00
commit 0e88fe0227

View file

@ -3606,7 +3606,7 @@ function get_default_enrol_roles(context $context, $addroleid = null) {
LEFT JOIN {role_context_levels} rcl ON (rcl.roleid = r.id AND rcl.contextlevel = :contextlevel) LEFT JOIN {role_context_levels} rcl ON (rcl.roleid = r.id AND rcl.contextlevel = :contextlevel)
LEFT JOIN {role_names} rn ON (rn.contextid = :coursecontext AND rn.roleid = r.id) LEFT JOIN {role_names} rn ON (rn.contextid = :coursecontext AND rn.roleid = r.id)
WHERE rcl.id IS NOT NULL $addrole WHERE rcl.id IS NOT NULL $addrole
ORDER BY sortorder DESC"; ORDER BY r.sortorder";
$roles = $DB->get_records_sql($sql, $params); $roles = $DB->get_records_sql($sql, $params);