X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=blobdiff_plain;f=lib%2Faccesslib.php;h=b7c0c94197067c7dab7ddc99fd079a8d3b9ca312;hp=43fde862cac78a4ed614ec4175324ac2d9456f5b;hb=e968c5f9105d3eb44cf46e071eae3fbae506239b;hpb=311b953168531adc55127a6c7bf3e93779f4c1d9 diff --git a/lib/accesslib.php b/lib/accesslib.php index 43fde862cac..b7c0c941970 100644 --- a/lib/accesslib.php +++ b/lib/accesslib.php @@ -1604,7 +1604,9 @@ function role_assign($roleid, $userid, $contextid, $component = '', $itemid = 0, $timemodified = time(); } -/// Check for existing entry + // Check for existing entry + // TODO: Revisit this sql_empty() use once Oracle bindings are improved. MDL-29765 + $component = ($component === '') ? $DB->sql_empty() : $component; $ras = $DB->get_records('role_assignments', array('roleid'=>$roleid, 'contextid'=>$context->id, 'userid'=>$userid, 'component'=>$component, 'itemid'=>$itemid), 'id'); if ($ras) { @@ -1717,6 +1719,10 @@ function role_unassign_all(array $params, $subcontexts = false, $includemanual = } } + // TODO: Revisit this sql_empty() use once Oracle bindings are improved. MDL-29765 + if (isset($params['component'])) { + $params['component'] = ($params['component'] === '') ? $DB->sql_empty() : $params['component']; + } $ras = $DB->get_records('role_assignments', $params); foreach($ras as $ra) { $DB->delete_records('role_assignments', array('id'=>$ra->id));