MDL-34471 libraries: Replace all uses of get_context_instance() with respective context_XXXX::instance() method
This commit is contained in:
+4
-4
@@ -523,7 +523,7 @@ function message_get_course_contexts($courses) {
|
||||
$coursecontexts = array();
|
||||
|
||||
foreach($courses as $course) {
|
||||
$coursecontexts[$course->id] = get_context_instance(CONTEXT_COURSE, $course->id);
|
||||
$coursecontexts[$course->id] = context_course::instance($course->id);
|
||||
}
|
||||
|
||||
return $coursecontexts;
|
||||
@@ -1498,7 +1498,7 @@ function message_search_users($courseid, $searchtext, $sort='', $exceptions='')
|
||||
$order", $params);
|
||||
} else {
|
||||
//TODO: add enabled enrolment join here (skodak)
|
||||
$context = get_context_instance(CONTEXT_COURSE, $courseid);
|
||||
$context = context_course::instance($courseid);
|
||||
$contextlists = get_related_contexts_string($context);
|
||||
|
||||
// everyone who has a role assignment in this course or higher
|
||||
@@ -1535,7 +1535,7 @@ function message_search($searchterms, $fromme=true, $tome=true, $courseid='none'
|
||||
global $CFG, $USER, $DB;
|
||||
|
||||
// If user is searching all messages check they are allowed to before doing anything else
|
||||
if ($courseid == SITEID && !has_capability('moodle/site:readallmessages', get_context_instance(CONTEXT_SYSTEM))) {
|
||||
if ($courseid == SITEID && !has_capability('moodle/site:readallmessages', context_system::instance())) {
|
||||
print_error('accessdenied','admin');
|
||||
}
|
||||
|
||||
@@ -2031,7 +2031,7 @@ function message_post_message($userfrom, $userto, $message, $format) {
|
||||
$eventdata->smallmessage = $message;//store the message unfiltered. Clean up on output.
|
||||
|
||||
$s = new stdClass();
|
||||
$s->sitename = format_string($SITE->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, SITEID)));
|
||||
$s->sitename = format_string($SITE->shortname, true, array('context' => context_course::instance(SITEID)));
|
||||
$s->url = $CFG->wwwroot.'/message/index.php?user='.$userto->id.'&id='.$userfrom->id;
|
||||
|
||||
$emailtagline = get_string_manager()->get_string('emailtagline', 'message', $s, $userto->lang);
|
||||
|
||||
Reference in New Issue
Block a user