1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 05:00:06 +01:00

MDL-23149 install - fixed problem under Oracle using reserved words as placeholders. Thanks Dan Marsen!

This commit is contained in:
Eloy Lafuente 2010-07-08 13:34:09 +00:00
parent 9db7f99b3c
commit a9f877152f

@ -4622,7 +4622,7 @@ function get_overridable_roles($context, $rolenamedisplay = ROLENAME_ALIAS, $wit
function get_default_enrol_roles($context, $addroleid = null) { function get_default_enrol_roles($context, $addroleid = null) {
global $DB; global $DB;
$params = array('level'=>CONTEXT_COURSE); $params = array('contextlevel'=>CONTEXT_COURSE);
if ($addroleid) { if ($addroleid) {
$addrole = "OR r.id = :addroleid"; $addrole = "OR r.id = :addroleid";
$params['addroleid'] = $addroleid; $params['addroleid'] = $addroleid;
@ -4631,7 +4631,7 @@ function get_default_enrol_roles($context, $addroleid = null) {
} }
$sql = "SELECT r.id, r.name $sql = "SELECT r.id, r.name
FROM {role} r FROM {role} r
LEFT JOIN {role_context_levels} rcl ON (rcl.roleid = r.id AND rcl.contextlevel = :level) LEFT JOIN {role_context_levels} rcl ON (rcl.roleid = r.id AND rcl.contextlevel = :contextlevel)
WHERE rcl.id IS NOT NULL $addrole WHERE rcl.id IS NOT NULL $addrole
ORDER BY sortorder DESC"; ORDER BY sortorder DESC";