Home
Documentation
Downloads
Demo
Tracker
Development
Translation
Moodle.net
Search
projects
/
moodle.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
edfeca5
)
Merge branch 'MDL-47594_master' of git://github.com/kordan/moodle
author
Sam Hemelryk
<sam@moodle.com>
Wed, 15 Oct 2014 22:04:53 +0000
(11:04 +1300)
committer
Sam Hemelryk
<sam@moodle.com>
Wed, 15 Oct 2014 22:04:53 +0000
(11:04 +1300)
lib/accesslib.php
patch
|
blob
|
blame
|
history
diff --git
a/lib/accesslib.php
b/lib/accesslib.php
index
b3ed02a
..
abd8fdb
100644
(file)
--- a/
lib/accesslib.php
+++ b/
lib/accesslib.php
@@
-3110,10
+3110,6
@@
function get_user_roles_in_course($userid, $courseid) {
$context = context_course::instance($courseid);
}
- if (empty($CFG->profileroles)) {
- return array();
- }
-
list($rallowed, $params) = $DB->get_in_or_equal(explode(',', $CFG->profileroles), SQL_PARAMS_NAMED, 'a');
list($contextlist, $cparams) = $DB->get_in_or_equal($context->get_parent_context_ids(true), SQL_PARAMS_NAMED, 'p');
$params = array_merge($params, $cparams);