diff --git a/blocks/admin_bookmarks/block_admin_bookmarks.php b/blocks/admin_bookmarks/block_admin_bookmarks.php
index 331f353b86f..ddf8f222e82 100644
--- a/blocks/admin_bookmarks/block_admin_bookmarks.php
+++ b/blocks/admin_bookmarks/block_admin_bookmarks.php
@@ -61,7 +61,7 @@ class block_admin_bookmarks extends block_base {
* @return array
*/
function applicable_formats() {
- if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
+ if (has_capability('moodle/site:config', context_system::instance())) {
return array('all' => true);
} else {
return array('site' => true);
diff --git a/blocks/admin_bookmarks/create.php b/blocks/admin_bookmarks/create.php
index ecb4c3e6bdf..6470cc99f4d 100644
--- a/blocks/admin_bookmarks/create.php
+++ b/blocks/admin_bookmarks/create.php
@@ -4,7 +4,7 @@ require('../../config.php');
require_once($CFG->libdir.'/adminlib.php');
require_login();
-$context = get_context_instance(CONTEXT_SYSTEM);
+$context = context_system::instance();
$PAGE->set_context($context);
$adminroot = admin_get_root(false, false); // settings not required - only pages
diff --git a/blocks/admin_bookmarks/delete.php b/blocks/admin_bookmarks/delete.php
index 7abe599a7b2..d73c7365c71 100644
--- a/blocks/admin_bookmarks/delete.php
+++ b/blocks/admin_bookmarks/delete.php
@@ -5,7 +5,7 @@ require('../../config.php');
require_once($CFG->libdir.'/adminlib.php');
require_login();
-$context = get_context_instance(CONTEXT_SYSTEM);
+$context = context_system::instance();
$PAGE->set_context($context);
$adminroot = admin_get_root(false, false); // settings not required - only pages
diff --git a/blocks/blog_menu/block_blog_menu.php b/blocks/blog_menu/block_blog_menu.php
index 9b237ecb3ef..c85576a0f26 100644
--- a/blocks/blog_menu/block_blog_menu.php
+++ b/blocks/blog_menu/block_blog_menu.php
@@ -98,7 +98,7 @@ class block_blog_menu extends block_base {
$this->content->text = html_writer::alist($menulist, array('class'=>'list'));
// Prepare the footer for this block
- if (has_capability('moodle/blog:search', get_context_instance(CONTEXT_SYSTEM))) {
+ if (has_capability('moodle/blog:search', context_system::instance())) {
// Full-text search field
$form = html_writer::tag('label', get_string('search', 'admin'), array('for'=>'blogsearchquery', 'class'=>'accesshide'));
$form .= html_writer::empty_tag('input', array('id'=>'blogsearchquery', 'type'=>'text', 'name'=>'search'));
diff --git a/blocks/blog_tags/block_blog_tags.php b/blocks/blog_tags/block_blog_tags.php
index c84f9d2e02f..9fb8b3a1bad 100644
--- a/blocks/blog_tags/block_blog_tags.php
+++ b/blocks/blog_tags/block_blog_tags.php
@@ -118,7 +118,7 @@ class block_blog_tags extends block_base {
// admins should be able to read all tags
$type = '';
- if (!has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_SYSTEM))) {
+ if (!has_capability('moodle/user:readuserblogs', context_system::instance())) {
$type = " AND (p.publishstate = 'site' or p.publishstate='public')";
}
diff --git a/blocks/calendar_upcoming/block_calendar_upcoming.php b/blocks/calendar_upcoming/block_calendar_upcoming.php
index 3b352108c8a..1655178a097 100644
--- a/blocks/calendar_upcoming/block_calendar_upcoming.php
+++ b/blocks/calendar_upcoming/block_calendar_upcoming.php
@@ -28,7 +28,7 @@ class block_calendar_upcoming extends block_base {
$this->content->footer = '
'.
diff --git a/blocks/community/communitycourse.php b/blocks/community/communitycourse.php
index 3f32ef77f2b..3e6497f1161 100644
--- a/blocks/community/communitycourse.php
+++ b/blocks/community/communitycourse.php
@@ -36,7 +36,7 @@ require_login();
$courseid = required_param('courseid', PARAM_INT); //if no courseid is given
$parentcourse = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
-$context = get_context_instance(CONTEXT_COURSE, $courseid);
+$context = context_course::instance($courseid);
$PAGE->set_course($parentcourse);
$PAGE->set_url('/blocks/community/communitycourse.php');
$PAGE->set_heading($SITE->fullname);
diff --git a/blocks/community/forms.php b/blocks/community/forms.php
index fafab8a6035..075ab2af6c8 100644
--- a/blocks/community/forms.php
+++ b/blocks/community/forms.php
@@ -191,7 +191,7 @@ class community_hub_search_form extends moodleform {
//display enrol/download select box if the USER has the download capability on the course
if (has_capability('moodle/community:download',
- get_context_instance(CONTEXT_COURSE, $this->_customdata['courseid']))) {
+ context_course::instance($this->_customdata['courseid']))) {
$options = array(0 => get_string('enrollable', 'block_community'),
1 => get_string('downloadable', 'block_community'));
$mform->addElement('select', 'downloadable', get_string('enroldownload', 'block_community'),
diff --git a/blocks/community/locallib.php b/blocks/community/locallib.php
index 5c39f75348e..b2ec8ab5a5c 100644
--- a/blocks/community/locallib.php
+++ b/blocks/community/locallib.php
@@ -113,7 +113,7 @@ class block_community_manager {
$fs = get_file_storage();
$record = new stdClass();
- $record->contextid = get_context_instance(CONTEXT_USER, $USER->id)->id;
+ $record->contextid = context_user::instance($USER->id)->id;
$record->component = 'user';
$record->filearea = 'private';
$record->itemid = 0;
diff --git a/blocks/completionstatus/block_completionstatus.php b/blocks/completionstatus/block_completionstatus.php
index 52cd48d23d1..2b598ce767f 100644
--- a/blocks/completionstatus/block_completionstatus.php
+++ b/blocks/completionstatus/block_completionstatus.php
@@ -51,7 +51,7 @@ class block_completionstatus extends block_base {
$this->content = new stdClass;
// Can edit settings?
- $can_edit = has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $this->page->course->id));
+ $can_edit = has_capability('moodle/course:update', context_course::instance($this->page->course->id));
// Get course completion data
$info = new completion_info($this->page->course);
@@ -84,7 +84,7 @@ class block_completionstatus extends block_base {
// Check this user is enroled
if (!$info->is_tracked_user($USER->id)) {
// If not enrolled, but are can view the report:
- if (has_capability('report/completion:view', get_context_instance(CONTEXT_COURSE, $COURSE->id))) {
+ if (has_capability('report/completion:view', context_course::instance($COURSE->id))) {
$this->content->text = ''.get_string('viewcoursereport', 'completion').'';
return $this->content;
diff --git a/blocks/completionstatus/details.php b/blocks/completionstatus/details.php
index a1ac77177b0..a71da02635a 100644
--- a/blocks/completionstatus/details.php
+++ b/blocks/completionstatus/details.php
@@ -52,8 +52,8 @@ if ($userid) {
// Check permissions
require_login($course);
-$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
-$personalcontext = get_context_instance(CONTEXT_USER, $user->id);
+$coursecontext = context_course::instance($course->id);
+$personalcontext = context_user::instance($user->id);
$can_view = false;
diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php
index 282f9e22d07..39db54993e8 100644
--- a/blocks/course_list/block_course_list.php
+++ b/blocks/course_list/block_course_list.php
@@ -33,17 +33,17 @@ class block_course_list extends block_list {
}
if (empty($CFG->disablemycourses) and isloggedin() and !isguestuser() and
- !(has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) and $adminseesall)) { // Just print My Courses
+ !(has_capability('moodle/course:update', context_system::instance()) and $adminseesall)) { // Just print My Courses
if ($courses = enrol_get_my_courses(NULL, 'visible DESC, fullname ASC')) {
foreach ($courses as $course) {
- $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+ $coursecontext = context_course::instance($course->id);
$linkcss = $course->visible ? "" : " class=\"dimmed\" ";
$this->content->items[]="
shortname, true, array('context' => $coursecontext)) . "\" ".
"href=\"$CFG->wwwroot/course/view.php?id=$course->id\">".$icon.format_string($course->fullname). "";
}
$this->title = get_string('mycourses');
/// If we can update any course of the view all isn't hidden, show the view all courses link
- if (has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) || empty($CFG->block_course_list_hideallcourseslink)) {
+ if (has_capability('moodle/course:update', context_system::instance()) || empty($CFG->block_course_list_hideallcourseslink)) {
$this->content->footer = "
wwwroot/course/index.php\">".get_string("fulllistofcourses")." ...";
}
}
@@ -57,12 +57,12 @@ class block_course_list extends block_list {
if ($categories) { //Check we have categories
if (count($categories) > 1 || (count($categories) == 1 && $DB->count_records('course') > 200)) { // Just print top level category links
foreach ($categories as $category) {
- $categoryname = format_string($category->name, true, array('context' => get_context_instance(CONTEXT_COURSECAT, $category->id)));
+ $categoryname = format_string($category->name, true, array('context' => context_coursecat::instance($category->id)));
$linkcss = $category->visible ? "" : " class=\"dimmed\" ";
$this->content->items[]="
wwwroot/course/category.php?id=$category->id\">".$icon . $categoryname . "";
}
/// If we can update any course of the view all isn't hidden, show the view all courses link
- if (has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) || empty($CFG->block_course_list_hideallcourseslink)) {
+ if (has_capability('moodle/course:update', context_system::instance()) || empty($CFG->block_course_list_hideallcourseslink)) {
$this->content->footer .= "
wwwroot/course/index.php\">".get_string('fulllistofcourses').' ...';
}
$this->title = get_string('categories');
@@ -72,16 +72,16 @@ class block_course_list extends block_list {
if ($courses) {
foreach ($courses as $course) {
- $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+ $coursecontext = context_course::instance($course->id);
$linkcss = $course->visible ? "" : " class=\"dimmed\" ";
$this->content->items[]="
shortname, true, array('context' => $coursecontext))."\" ".
"href=\"$CFG->wwwroot/course/view.php?id=$course->id\">"
- .$icon. format_string($course->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))) . "";
+ .$icon. format_string($course->fullname, true, array('context' => context_course::instance($course->id))) . "";
}
/// If we can update any course of the view all isn't hidden, show the view all courses link
- if (has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) || empty($CFG->block_course_list_hideallcourseslink)) {
+ if (has_capability('moodle/course:update', context_system::instance()) || empty($CFG->block_course_list_hideallcourseslink)) {
$this->content->footer .= "
wwwroot/course/index.php\">".get_string('fulllistofcourses').' ...';
}
$this->get_remote_courses();
@@ -89,7 +89,7 @@ class block_course_list extends block_list {
$this->content->icons[] = '';
$this->content->items[] = get_string('nocoursesyet');
- if (has_capability('moodle/course:create', get_context_instance(CONTEXT_COURSECAT, $category->id))) {
+ if (has_capability('moodle/course:create', context_coursecat::instance($category->id))) {
$this->content->footer = '
'.get_string("addnewcourse").' ...';
}
$this->get_remote_courses();
@@ -120,7 +120,7 @@ class block_course_list extends block_list {
$this->content->items[] = get_string('remotecourses','mnet');
$this->content->icons[] = '';
foreach ($courses as $course) {
- $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+ $coursecontext = context_course::instance($course->id);
$this->content->items[]="
shortname, true, array('context' => $coursecontext)) . "\" ".
"href=\"{$CFG->wwwroot}/auth/mnet/jump.php?hostid={$course->hostid}&wantsurl=/course/view.php?id={$course->remoteid}\">"
.$icon. format_string($course->fullname) . "";
diff --git a/blocks/course_summary/block_course_summary.php b/blocks/course_summary/block_course_summary.php
index 35ed7b56145..cac6591316d 100644
--- a/blocks/course_summary/block_course_summary.php
+++ b/blocks/course_summary/block_course_summary.php
@@ -28,7 +28,7 @@ class block_course_summary extends block_base {
$options = new stdClass();
$options->noclean = true; // Don't clean Javascripts etc
$options->overflowdiv = true;
- $context = get_context_instance(CONTEXT_COURSE, $this->page->course->id);
+ $context = context_course::instance($this->page->course->id);
$this->page->course->summary = file_rewrite_pluginfile_urls($this->page->course->summary, 'pluginfile.php', $context->id, 'course', 'summary', NULL);
$this->content->text = format_text($this->page->course->summary, $this->page->course->summaryformat, $options);
if ($this->page->user_is_editing()) {
diff --git a/blocks/edit_form.php b/blocks/edit_form.php
index bd7e2a6794e..9380fa2be72 100644
--- a/blocks/edit_form.php
+++ b/blocks/edit_form.php
@@ -265,7 +265,7 @@ class block_edit_form extends moodleform {
$defaults->bui_subpagepattern = '%@NULL@%';
}
- $systemcontext = get_context_instance(CONTEXT_SYSTEM);
+ $systemcontext = context_system::instance();
if ($defaults->parentcontextid == $systemcontext->id) {
$defaults->bui_contexts = BUI_CONTEXTS_ENTIRE_SITE; // System-wide and sticky
} else {
diff --git a/blocks/glossary_random/block_glossary_random.php b/blocks/glossary_random/block_glossary_random.php
index dac296a531d..0128f1bf436 100644
--- a/blocks/glossary_random/block_glossary_random.php
+++ b/blocks/glossary_random/block_glossary_random.php
@@ -45,7 +45,7 @@ class block_glossary_random extends block_base {
if (! $cm = get_coursemodule_from_instance("glossary", $this->config->glossary, $this->course->id)) {
return false;
}
- $glossaryctx = get_context_instance(CONTEXT_MODULE, $cm->id);
+ $glossaryctx = context_module::instance($cm->id);
$limitfrom = 0;
$limitnum = 1;
@@ -131,7 +131,7 @@ class block_glossary_random extends block_base {
$glossaryid = $this->config->glossary;
$cm = $modinfo->instances['glossary'][$glossaryid];
- if (!has_capability('mod/glossary:view', get_context_instance(CONTEXT_MODULE, $cm->id))) {
+ if (!has_capability('mod/glossary:view', context_module::instance($cm->id))) {
return '';
}
@@ -162,7 +162,7 @@ class block_glossary_random extends block_base {
//Obtain the visible property from the instance
if ($cm->uservisible) {
- if (has_capability('mod/glossary:write', get_context_instance(CONTEXT_MODULE, $cm->id))) {
+ if (has_capability('mod/glossary:write', context_module::instance($cm->id))) {
$this->content->footer = '
'.$this->config->addentry.'';
} else {
diff --git a/blocks/mnet_hosts/block_mnet_hosts.php b/blocks/mnet_hosts/block_mnet_hosts.php
index 3c6916bf09c..2021fefe151 100644
--- a/blocks/mnet_hosts/block_mnet_hosts.php
+++ b/blocks/mnet_hosts/block_mnet_hosts.php
@@ -10,7 +10,7 @@ class block_mnet_hosts extends block_list {
}
function applicable_formats() {
- if (has_capability('moodle/site:mnetlogintoremote', get_context_instance(CONTEXT_SYSTEM), NULL, false)) {
+ if (has_capability('moodle/site:mnetlogintoremote', context_system::instance(), NULL, false)) {
return array('all' => true, 'mod' => false, 'tag' => false);
} else {
return array('site' => true);
@@ -59,7 +59,7 @@ class block_mnet_hosts extends block_list {
}
}
- if (!has_capability('moodle/site:mnetlogintoremote', get_context_instance(CONTEXT_SYSTEM), NULL, false)) {
+ if (!has_capability('moodle/site:mnetlogintoremote', context_system::instance(), NULL, false)) {
if (debugging() and !empty($CFG->debugdisplay)) {
$this->content = new stdClass();
$this->content->footer = html_writer::tag('span',
diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index 3d67dd707ab..d5a20a254ac 100644
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -418,7 +418,7 @@ class block_base {
$this->config = unserialize(base64_decode($instance->configdata));
}
$this->instance = $instance;
- $this->context = get_context_instance(CONTEXT_BLOCK, $instance->id);
+ $this->context = context_block::instance($instance->id);
$this->page = $page;
$this->specialization();
}
diff --git a/blocks/news_items/block_news_items.php b/blocks/news_items/block_news_items.php
index 3561c4f762b..d6515e8e147 100644
--- a/blocks/news_items/block_news_items.php
+++ b/blocks/news_items/block_news_items.php
@@ -41,7 +41,7 @@ class block_news_items extends block_base {
return '';
}
- $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+ $context = context_module::instance($cm->id);
/// User must have perms to view discussions in that forum
if (!has_capability('mod/forum:viewdiscussion', $context)) {
diff --git a/blocks/participants/block_participants.php b/blocks/participants/block_participants.php
index deeeb7d9989..c46a5aa3d66 100644
--- a/blocks/participants/block_participants.php
+++ b/blocks/participants/block_participants.php
@@ -26,7 +26,7 @@ class block_participants extends block_list {
$this->content = '';
return $this->content;
} else if ($this->page->course->id == SITEID) {
- if (!has_capability('moodle/site:viewparticipants', get_context_instance(CONTEXT_SYSTEM))) {
+ if (!has_capability('moodle/site:viewparticipants', context_system::instance())) {
$this->content = '';
return $this->content;
}
diff --git a/blocks/private_files/edit.php b/blocks/private_files/edit.php
index 67b1e70d5bc..c3fa1780d7c 100644
--- a/blocks/private_files/edit.php
+++ b/blocks/private_files/edit.php
@@ -33,7 +33,7 @@ if (isguestuser()) {
}
//TODO: add capability check here!
-$context = get_context_instance(CONTEXT_USER, $USER->id);
+$context = context_user::instance($USER->id);
$title = get_string('privatefiles', 'block_private_files');
$struser = get_string('user');
diff --git a/blocks/private_files/renderer.php b/blocks/private_files/renderer.php
index eb109faa1b8..e93121986bf 100644
--- a/blocks/private_files/renderer.php
+++ b/blocks/private_files/renderer.php
@@ -85,7 +85,7 @@ class private_files_tree implements renderable {
public $dir;
public function __construct() {
global $USER;
- $this->context = get_context_instance(CONTEXT_USER, $USER->id);
+ $this->context = context_user::instance($USER->id);
$fs = get_file_storage();
$this->dir = $fs->get_area_tree($this->context->id, 'user', 'private', 0);
}
diff --git a/blocks/quiz_results/block_quiz_results.php b/blocks/quiz_results/block_quiz_results.php
index 7ea73f0cf54..d18af5563c8 100644
--- a/blocks/quiz_results/block_quiz_results.php
+++ b/blocks/quiz_results/block_quiz_results.php
@@ -151,7 +151,7 @@ class block_quiz_results extends block_base {
$context = $this->page->context;
} else {
$cm = get_coursemodule_from_instance('quiz', $quizid, $courseid);
- $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+ $context = context_module::instance($cm->id);
}
$groupmode = groups_get_activity_groupmode($cm);
diff --git a/blocks/rss_client/editfeed.php b/blocks/rss_client/editfeed.php
index ce7a09bc2aa..7067835286d 100644
--- a/blocks/rss_client/editfeed.php
+++ b/blocks/rss_client/editfeed.php
@@ -158,7 +158,7 @@ if ($courseid) {
$PAGE->set_course($course);
$context = $PAGE->context;
} else {
- $context = get_context_instance(CONTEXT_SYSTEM);
+ $context = context_system::instance();
$PAGE->set_context($context);
}
diff --git a/blocks/rss_client/managefeeds.php b/blocks/rss_client/managefeeds.php
index 2e3e3c6978f..0340b0f789c 100644
--- a/blocks/rss_client/managefeeds.php
+++ b/blocks/rss_client/managefeeds.php
@@ -40,7 +40,7 @@ if ($courseid) {
$PAGE->set_course($course);
$context = $PAGE->context;
} else {
- $context = get_context_instance(CONTEXT_SYSTEM);
+ $context = context_system::instance();
$PAGE->set_context($context);
}
diff --git a/blocks/rss_client/viewfeed.php b/blocks/rss_client/viewfeed.php
index d1235c8fcd3..f969a300577 100644
--- a/blocks/rss_client/viewfeed.php
+++ b/blocks/rss_client/viewfeed.php
@@ -43,7 +43,7 @@ if ($courseid) {
$PAGE->set_course($course);
$context = $PAGE->context;
} else {
- $context = get_context_instance(CONTEXT_SYSTEM);
+ $context = context_system::instance();
$PAGE->set_context($context);
}
diff --git a/blocks/section_links/block_section_links.php b/blocks/section_links/block_section_links.php
index 734e6242e38..a8a0a93fe46 100644
--- a/blocks/section_links/block_section_links.php
+++ b/blocks/section_links/block_section_links.php
@@ -72,7 +72,7 @@ class block_section_links extends block_base {
}
$course = $this->page->course;
- $context = get_context_instance(CONTEXT_COURSE, $course->id);
+ $context = context_course::instance($course->id);
if ($course->format == 'weeks' or $course->format == 'weekscss') {
$highlight = ceil((time()-$course->startdate)/604800);
diff --git a/blocks/selfcompletion/block_selfcompletion.php b/blocks/selfcompletion/block_selfcompletion.php
index 9fe4a84b373..7a44dfec566 100644
--- a/blocks/selfcompletion/block_selfcompletion.php
+++ b/blocks/selfcompletion/block_selfcompletion.php
@@ -51,7 +51,7 @@ class block_selfcompletion extends block_base {
$this->content = new stdClass;
// Can edit settings?
- $can_edit = has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $this->page->course->id));
+ $can_edit = has_capability('moodle/course:update', context_course::instance($this->page->course->id));
// Get course completion data
$info = new completion_info($this->page->course);
diff --git a/blocks/settings/block_settings.php b/blocks/settings/block_settings.php
index 3e2aea838e3..57a4d9b514c 100644
--- a/blocks/settings/block_settings.php
+++ b/blocks/settings/block_settings.php
@@ -134,7 +134,7 @@ class block_settings extends block_base {
// only do search if you have moodle/site:config
if (!empty($this->content->text)) {
- if (has_capability('moodle/site:config',get_context_instance(CONTEXT_SYSTEM)) ) {
+ if (has_capability('moodle/site:config',context_system::instance()) ) {
$this->content->footer = $renderer->search_form(new moodle_url("$CFG->wwwroot/$CFG->admin/search.php"), optional_param('query', '', PARAM_RAW));
} else {
$this->content->footer = '';
diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php
index d3434f845b9..5d2c515bbc0 100644
--- a/blocks/site_main_menu/block_site_main_menu.php
+++ b/blocks/site_main_menu/block_site_main_menu.php
@@ -27,7 +27,7 @@ class block_site_main_menu extends block_list {
$course = $this->page->course;
require_once($CFG->dirroot.'/course/lib.php');
- $context = get_context_instance(CONTEXT_COURSE, $course->id);
+ $context = context_course::instance($course->id);
$isediting = $this->page->user_is_editing() && has_capability('moodle/course:manageactivities', $context);
$modinfo = get_fast_modinfo($course);
diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php
index 886e8883951..d9f98b01107 100644
--- a/blocks/social_activities/block_social_activities.php
+++ b/blocks/social_activities/block_social_activities.php
@@ -29,7 +29,7 @@ class block_social_activities extends block_list {
require_once($CFG->dirroot.'/course/lib.php');
- $context = get_context_instance(CONTEXT_COURSE, $course->id);
+ $context = context_course::instance($course->id);
$isediting = $this->page->user_is_editing() && has_capability('moodle/course:manageactivities', $context);
$modinfo = get_fast_modinfo($course);
diff --git a/blocks/tags/block_tags.php b/blocks/tags/block_tags.php
index b7a35fd9bab..70722b6a2cd 100644
--- a/blocks/tags/block_tags.php
+++ b/blocks/tags/block_tags.php
@@ -81,13 +81,12 @@ class block_tags extends block_base {
require_once($CFG->dirroot.'/tag/coursetagslib.php');
// Permissions and page awareness
- $systemcontext = get_context_instance(CONTEXT_SYSTEM);
+ $systemcontext = context_system::instance();
$loggedin = isloggedin() && !isguestuser();
$coursepage = $canedit = false;
$coursepage = (isset($this->page->course->id) && $this->page->course->id != SITEID);
$mymoodlepage = ($SCRIPT == '/my/index.php') ? true : false;
$sitepage = (isset($this->page->course->id) && $this->page->course->id == SITEID && !$mymoodlepage);
- $coursecontext = get_context_instance(CONTEXT_COURSE, $this->page->course->id);
if ($coursepage) {
$canedit = has_capability('moodle/tag:create', $systemcontext);
}