diff --git a/mod/quiz/attemptlib.php b/mod/quiz/attemptlib.php
index 1de37c1b0cb..78a74a61307 100644
--- a/mod/quiz/attemptlib.php
+++ b/mod/quiz/attemptlib.php
@@ -87,7 +87,7 @@ class quiz {
         $this->quiz->cmid = $this->cm->id;
         $this->course = $course;
         if ($getcontext && !empty($cm->id)) {
-            $this->context = get_context_instance(CONTEXT_MODULE, $cm->id);
+            $this->context = context_module::instance($cm->id);
         }
         $questionids = quiz_questions_in_quiz($this->quiz->questions);
         if ($questionids) {
diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index 6d16aa752d2..44f00d6ec89 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -744,7 +744,7 @@ function quiz_print_pagecontrols($quiz, $pageurl, $page, $hasattempts,
     echo '<div class="pagecontrols">';
 
     // Get the current context.
-    $thiscontext = get_context_instance(CONTEXT_COURSE, $quiz->course);
+    $thiscontext = context_course::instance($quiz->course);
     $contexts = new question_edit_contexts($thiscontext);
 
     // Get the default category.
diff --git a/mod/quiz/index.php b/mod/quiz/index.php
index 6317a4a1373..8249d68e6ed 100644
--- a/mod/quiz/index.php
+++ b/mod/quiz/index.php
@@ -32,7 +32,7 @@ $PAGE->set_url('/mod/quiz/index.php', array('id'=>$id));
 if (!$course = $DB->get_record('course', array('id' => $id))) {
     print_error('invalidcourseid');
 }
-$coursecontext = get_context_instance(CONTEXT_COURSE, $id);
+$coursecontext = context_course::instance($id);
 require_login($course);
 $PAGE->set_pagelayout('incourse');
 
@@ -124,7 +124,7 @@ $table->align = $align;
 $currentsection = '';
 foreach ($quizzes as $quiz) {
     $cm = get_coursemodule_from_instance('quiz', $quiz->id);
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
     $data = array();
 
     // Section number if necessary.
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 6e28cbfec20..f704992376e 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -839,7 +839,7 @@ function quiz_get_recent_mod_activity(&$activities, &$index, $timestart,
         return;
     }
 
-    $context         = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context         = context_module::instance($cm->id);
     $accessallgroups = has_capability('moodle/site:accessallgroups', $context);
     $viewfullnames   = has_capability('moodle/site:viewfullnames', $context);
     $grader          = has_capability('mod/quiz:viewreports', $context);
@@ -1075,7 +1075,7 @@ function quiz_after_add_or_update($quiz) {
 
     // We need to use context now, so we need to make sure all needed info is already in db.
     $DB->set_field('course_modules', 'instance', $quiz->id, array('id'=>$cmid));
-    $context = get_context_instance(CONTEXT_MODULE, $cmid);
+    $context = context_module::instance($cmid);
 
     // Save the feedback.
     $DB->delete_records('quiz_feedback', array('quizid' => $quiz->id));
@@ -1378,7 +1378,7 @@ function quiz_check_file_access($attemptuniqueid, $questionid, $context = null)
     if ($context === null) {
         $quiz = $DB->get_record('quiz', array('id' => $attempt->quiz));
         $cm = get_coursemodule_from_id('quiz', $quiz->id);
-        $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+        $context = context_module::instance($cm->id);
     }
 
     // Load those questions and the associated states.
@@ -1439,7 +1439,7 @@ function quiz_print_overview($courses, &$htmlarray) {
                     userdate($quiz->timeclose)) . '</div>';
 
             // Now provide more information depending on the uers's role.
-            $context = get_context_instance(CONTEXT_MODULE, $quiz->coursemodule);
+            $context = context_module::instance($quiz->coursemodule);
             if (has_capability('mod/quiz:viewreports', $context)) {
                 // For teacher-like people, show a summary of the number of student attempts.
                 // The $quiz objects returned by get_all_instances_in_course have the necessary $cm
@@ -1590,7 +1590,7 @@ function quiz_get_extra_capabilities() {
 function quiz_extend_navigation($quiznode, $course, $module, $cm) {
     global $CFG;
 
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
 
     if (has_capability('mod/quiz:view', $context)) {
         $url = new moodle_url('/mod/quiz/view.php', array('id'=>$cm->id));
diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index f535e9b8936..f19a9086dc0 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -1416,7 +1416,7 @@ function quiz_attempt_submitted_handler($event) {
     }
 
     return quiz_send_notification_messages($course, $quiz, $attempt,
-            get_context_instance(CONTEXT_MODULE, $cm->id), $cm);
+            context_module::instance($cm->id), $cm);
 }
 
 /**
@@ -1442,7 +1442,7 @@ function quiz_attempt_overdue_handler($event) {
     }
 
     return quiz_send_overdue_message($course, $quiz, $attempt,
-            get_context_instance(CONTEXT_MODULE, $cm->id), $cm);
+            context_module::instance($cm->id), $cm);
 }
 
 /**
diff --git a/mod/quiz/overridedelete.php b/mod/quiz/overridedelete.php
index f0b4f27dcdc..75282260482 100644
--- a/mod/quiz/overridedelete.php
+++ b/mod/quiz/overridedelete.php
@@ -42,7 +42,7 @@ if (! $cm = get_coursemodule_from_instance("quiz", $quiz->id, $quiz->course)) {
 }
 $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 
 require_login($course, false, $cm);
 
diff --git a/mod/quiz/overrideedit.php b/mod/quiz/overrideedit.php
index 1a62b02e325..fa0c53d84f8 100644
--- a/mod/quiz/overrideedit.php
+++ b/mod/quiz/overrideedit.php
@@ -74,7 +74,7 @@ $PAGE->set_url($url);
 
 require_login($course, false, $cm);
 
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 
 // Add or edit an override.
 require_capability('mod/quiz:manageoverrides', $context);
diff --git a/mod/quiz/overrides.php b/mod/quiz/overrides.php
index 88333deac68..88739209a86 100644
--- a/mod/quiz/overrides.php
+++ b/mod/quiz/overrides.php
@@ -62,7 +62,7 @@ $PAGE->set_url($url);
 
 require_login($course, false, $cm);
 
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 
 // Check the user has the required capabilities to list overrides.
 require_capability('mod/quiz:manageoverrides', $context);
diff --git a/mod/quiz/report.php b/mod/quiz/report.php
index 6a7c3cc73de..1741e97c183 100644
--- a/mod/quiz/report.php
+++ b/mod/quiz/report.php
@@ -63,7 +63,7 @@ if ($mode !== '') {
 $PAGE->set_url($url);
 
 require_login($course, false, $cm);
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('report');
 
 $reportlist = quiz_report_list($context);
diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index 606f45a1134..7d666ebc71b 100644
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -54,7 +54,7 @@ if ($id) {
 
 // Check login and get context.
 require_login($course, false, $cm);
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 require_capability('mod/quiz:view', $context);
 
 // Cache some other capabilities we use several times.
diff --git a/mod/scorm/aicc.php b/mod/scorm/aicc.php
index 3ef92957605..a73a7172001 100644
--- a/mod/scorm/aicc.php
+++ b/mod/scorm/aicc.php
@@ -195,7 +195,7 @@ if (!empty($command)) {
                     if (! $cm = get_coursemodule_from_instance("scorm", $scorm->id, $scorm->course)) {
                         echo "error=1\r\nerror_text=Unknown\r\n"; // No one must see this error message if not hacked
                     }
-                    if (!empty($aiccdata) && has_capability('mod/scorm:savetrack', get_context_instance(CONTEXT_MODULE, $cm->id), $aiccuser->id)) {
+                    if (!empty($aiccdata) && has_capability('mod/scorm:savetrack', context_module::instance($cm->id), $aiccuser->id)) {
                         $initlessonstatus = 'not attempted';
                         $lessonstatus = 'not attempted';
                         if (isset($scormsession->scorm_lessonstatus)) {
diff --git a/mod/scorm/datamodel.php b/mod/scorm/datamodel.php
index 2e8b94fddb5..6a81130b90b 100644
--- a/mod/scorm/datamodel.php
+++ b/mod/scorm/datamodel.php
@@ -53,7 +53,7 @@ require_login($course, false, $cm);
 if (confirm_sesskey() && (!empty($scoid))) {
     $result = true;
     $request = null;
-    if (has_capability('mod/scorm:savetrack', get_context_instance(CONTEXT_MODULE, $cm->id))) {
+    if (has_capability('mod/scorm:savetrack', context_module::instance($cm->id))) {
         foreach (data_submitted() as $element => $value) {
             $element = str_replace('__', '.', $element);
             if (substr($element, 0, 3) == 'cmi') {
diff --git a/mod/scorm/datamodels/aicclib.php b/mod/scorm/datamodels/aicclib.php
index f079950fd3d..3aecc7f00e5 100644
--- a/mod/scorm/datamodels/aicclib.php
+++ b/mod/scorm/datamodels/aicclib.php
@@ -117,7 +117,7 @@ function scorm_parse_aicc($scorm) {
         $cm = get_coursemodule_from_instance('scorm', $scorm->id);
         $scorm->cmid = $cm->id;
     }
-    $context = get_context_instance(CONTEXT_MODULE, $scorm->cmid);
+    $context = context_module::instance($scorm->cmid);
 
     $fs = get_file_storage();
 
diff --git a/mod/scorm/grade.php b/mod/scorm/grade.php
index 227a208f2ea..631b214ba97 100644
--- a/mod/scorm/grade.php
+++ b/mod/scorm/grade.php
@@ -41,7 +41,7 @@ if (! $course = $DB->get_record('course', array('id'=> $scorm->course))) {
 
 require_login($course, false, $cm);
 
-if (has_capability('mod/scorm:viewreport', get_context_instance(CONTEXT_MODULE, $cm->id))) {
+if (has_capability('mod/scorm:viewreport', context_module::instance($cm->id))) {
     redirect('report.php?id='.$cm->id);
 } else {
     redirect('view.php?id='.$cm->id);
diff --git a/mod/scorm/index.php b/mod/scorm/index.php
index eea68a28619..eb0428c4656 100644
--- a/mod/scorm/index.php
+++ b/mod/scorm/index.php
@@ -74,7 +74,7 @@ if ($usesections) {
 }
 
 foreach ($scorms as $scorm) {
-    $context = get_context_instance(CONTEXT_MODULE, $scorm->coursemodule);
+    $context = context_module::instance($scorm->coursemodule);
     $tt = "";
     if ($usesections) {
         if ($scorm->section) {
diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index 822d3e2e950..535fce184b3 100644
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -98,7 +98,7 @@ function scorm_add_instance($scorm, $mform=null) {
     $cmidnumber = $scorm->cmidnumber;
     $courseid   = $scorm->course;
 
-    $context = get_context_instance(CONTEXT_MODULE, $cmid);
+    $context = context_module::instance($cmid);
 
     $scorm = scorm_option2text($scorm);
     $scorm->width  = (int)str_replace('%', '', $scorm->width);
@@ -189,7 +189,7 @@ function scorm_update_instance($scorm, $mform=null) {
 
     $scorm->id = $scorm->instance;
 
-    $context = get_context_instance(CONTEXT_MODULE, $cmid);
+    $context = context_module::instance($cmid);
 
     if ($scorm->scormtype === SCORM_TYPE_LOCAL) {
         if ($mform) {
diff --git a/mod/scorm/loadSCO.php b/mod/scorm/loadSCO.php
index 29f49722f17..62dc8b9a06c 100644
--- a/mod/scorm/loadSCO.php
+++ b/mod/scorm/loadSCO.php
@@ -61,7 +61,7 @@ if ($scorm->timeclose !=0) {
     }
 }
 
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 
 if (!empty($scoid)) {
     //
diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index ab304dfad94..03445ab3329 100644
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -181,7 +181,7 @@ function scorm_parse($scorm, $full) {
         $cm = get_coursemodule_from_instance('scorm', $scorm->id);
         $scorm->cmid = $cm->id;
     }
-    $context = get_context_instance(CONTEXT_MODULE, $scorm->cmid);
+    $context = context_module::instance($scorm->cmid);
     $newhash = $scorm->sha1hash;
 
     if ($scorm->scormtype === SCORM_TYPE_LOCAL or $scorm->scormtype === SCORM_TYPE_LOCALSYNC) {
@@ -697,7 +697,7 @@ function scorm_course_format_display($user, $course) {
     global $CFG, $DB, $PAGE, $OUTPUT;
 
     $strupdate = get_string('update');
-    $context = get_context_instance(CONTEXT_COURSE, $course->id);
+    $context = context_course::instance($course->id);
 
     echo '<div class="mod-scorm">';
     if ($scorms = get_all_instances_in_course('scorm', $course)) {
@@ -706,7 +706,7 @@ function scorm_course_format_display($user, $course) {
         if (! $cm = get_coursemodule_from_instance('scorm', $scorm->id, $course->id)) {
             print_error('invalidcoursemodule');
         }
-        $contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
+        $contextmodule = context_module::instance($cm->id);
         if ((has_capability('mod/scorm:skipview', $contextmodule))) {
             scorm_simple_play($scorm, $user, $contextmodule, $cm->id);
         }
@@ -1426,7 +1426,7 @@ function scorm_get_toc($user,$scorm,$cmid,$toclink=TOCJSLINK,$currentorg='',$sco
                                 $scoid = $sco->id;
                             }
                         }
-                        if ($usertrack->score_raw != '' && has_capability('mod/scorm:viewscores', get_context_instance(CONTEXT_MODULE,$cmid))) {
+                        if ($usertrack->score_raw != '' && has_capability('mod/scorm:viewscores', context_module::instance($cmid))) {
                             $score = '('.get_string('score','scorm').':&nbsp;'.$usertrack->score_raw.')';
                         }
                         $strsuspended = get_string('suspended','scorm');
diff --git a/mod/scorm/player.php b/mod/scorm/player.php
index 570543d06c9..982a1a406f4 100644
--- a/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@ -87,7 +87,7 @@ $strscorm  = get_string('modulename', 'scorm');
 $strpopup = get_string('popup', 'scorm');
 $strexit = get_string('exitactivity', 'scorm');
 
-$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+$coursecontext = context_course::instance($course->id);
 
 if ($displaymode == 'popup') {
     $PAGE->set_pagelayout('popup');
diff --git a/mod/scorm/prereqs.php b/mod/scorm/prereqs.php
index 3909735bfc2..a507ef910d1 100644
--- a/mod/scorm/prereqs.php
+++ b/mod/scorm/prereqs.php
@@ -64,7 +64,7 @@ require_once($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'lib.php');
 if (confirm_sesskey() && (!empty($scoid))) {
     $result = true;
     $request = null;
-    if (has_capability('mod/scorm:savetrack', get_context_instance(CONTEXT_MODULE, $cm->id))) {
+    if (has_capability('mod/scorm:savetrack', context_module::instance($cm->id))) {
         $result = scorm_get_toc($USER, $scorm, $cm->id, TOCJSLINK, $currentorg, $scoid, $mode, $attempt, true, false);
         echo $result->toc;
     }
diff --git a/mod/scorm/report.php b/mod/scorm/report.php
index 78ea4a44f9f..b2fedfba47f 100644
--- a/mod/scorm/report.php
+++ b/mod/scorm/report.php
@@ -36,7 +36,7 @@ $cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
 $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 $scorm = $DB->get_record('scorm', array('id'=>$cm->instance), '*', MUST_EXIST);
 
-$contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
+$contextmodule = context_module::instance($cm->id);
 $reportlist = scorm_report_list($contextmodule);
 
 $url = new moodle_url('/mod/scorm/report.php');
diff --git a/mod/scorm/report/basic/report.php b/mod/scorm/report/basic/report.php
index e201ea4500b..9ca50dc952d 100644
--- a/mod/scorm/report/basic/report.php
+++ b/mod/scorm/report/basic/report.php
@@ -33,7 +33,7 @@ class scorm_basic_report extends scorm_default_report {
      */
     function display($scorm, $cm, $course, $download) {
         global $CFG, $DB, $OUTPUT, $PAGE;
-        $contextmodule= get_context_instance(CONTEXT_MODULE, $cm->id);
+        $contextmodule= context_module::instance($cm->id);
         $action = optional_param('action', '', PARAM_ALPHA);
         $attemptids = optional_param_array('attemptid', array(), PARAM_RAW);
         $attemptsmode = optional_param('attemptsmode', SCORM_REPORT_ATTEMPTS_ALL_STUDENTS, PARAM_INT);
diff --git a/mod/scorm/report/interactions/report.php b/mod/scorm/report/interactions/report.php
index 0756ebd2898..9e77e47a122 100644
--- a/mod/scorm/report/interactions/report.php
+++ b/mod/scorm/report/interactions/report.php
@@ -35,7 +35,7 @@ class scorm_interactions_report extends scorm_default_report {
      */
     function display($scorm, $cm, $course, $download) {
         global $CFG, $DB, $OUTPUT, $PAGE;
-        $contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
+        $contextmodule = context_module::instance($cm->id);
         $action = optional_param('action', '', PARAM_ALPHA);
         $attemptids = optional_param_array('attemptid', array(), PARAM_RAW);
         $attemptsmode = optional_param('attemptsmode', SCORM_REPORT_ATTEMPTS_ALL_STUDENTS, PARAM_INT);
@@ -84,7 +84,7 @@ class scorm_interactions_report extends scorm_default_report {
                 groups_print_activity_menu($cm, new moodle_url($PAGE->url, $displayoptions));
             }
         }
-        $formattextoptions = array('context' => get_context_instance(CONTEXT_COURSE, $course->id));
+        $formattextoptions = array('context' => context_course::instance($course->id));
 
         // We only want to show the checkbox to delete attempts
         // if the user has permissions and if the report mode is showing attempts.
diff --git a/mod/scorm/tabs.php b/mod/scorm/tabs.php
index 44656072fb8..45cf9fe2d80 100644
--- a/mod/scorm/tabs.php
+++ b/mod/scorm/tabs.php
@@ -32,7 +32,7 @@ if (!isset($cm)) {
     $cm = get_coursemodule_from_instance('scorm', $scorm->id);
 }
 
-$contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
+$contextmodule = context_module::instance($cm->id);
 
 $tabs = array();
 $row = array();
diff --git a/mod/scorm/userreport.php b/mod/scorm/userreport.php
index daf83913251..5a02c4279f2 100644
--- a/mod/scorm/userreport.php
+++ b/mod/scorm/userreport.php
@@ -64,7 +64,7 @@ $PAGE->set_url($url);
 
 // checking login +logging +getting context
 require_login($course, false, $cm);
-$contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
+$contextmodule = context_module::instance($cm->id);
 require_capability('mod/scorm:viewreport', $contextmodule);
 
 add_to_log($course->id, 'scorm', 'userreport', 'userreport.php?id='.$cm->id, $scorm->id, $cm->id);
diff --git a/mod/scorm/view.php b/mod/scorm/view.php
index d90bfea1214..cb8fad15841 100644
--- a/mod/scorm/view.php
+++ b/mod/scorm/view.php
@@ -65,8 +65,8 @@ if (!empty($scorm->popup)) {
     $PAGE->requires->js('/mod/scorm/view.js', true);
 }
 
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
-$contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_course::instance($course->id);
+$contextmodule = context_module::instance($cm->id);
 
 if (isset($SESSION->scorm)) {
     unset($SESSION->scorm);
diff --git a/mod/survey/download.php b/mod/survey/download.php
index 562e84e2040..d3ba15893f4 100644
--- a/mod/survey/download.php
+++ b/mod/survey/download.php
@@ -40,7 +40,7 @@ if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
     print_error('coursemisconf');
 }
 
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 
 $PAGE->set_url('/mod/survey/download.php', array('id'=>$id, 'type'=>$type, 'group'=>$group));
 
@@ -146,7 +146,7 @@ foreach ($surveyanswers as $surveyanswer) {
 }
 
 // Output the file as a valid ODS spreadsheet if required
-$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+$coursecontext = context_course::instance($course->id);
 $courseshortname = format_string($course->shortname, true, array('context' => $coursecontext));
 
 if ($type == "ods") {
diff --git a/mod/survey/graph.php b/mod/survey/graph.php
index 14dabc107fd..7422e7d0b3e 100644
--- a/mod/survey/graph.php
+++ b/mod/survey/graph.php
@@ -39,7 +39,7 @@
     require_login($course, false, $cm);
 
     $groupmode = groups_get_activity_groupmode($cm);   // Groups are being used
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
 
     if (!has_capability('mod/survey:readresponses', $context)) {
         if ($type != "student.png" or $sid != $USER->id ) {
diff --git a/mod/survey/report.php b/mod/survey/report.php
index a5a641d822b..ab1af08986b 100644
--- a/mod/survey/report.php
+++ b/mod/survey/report.php
@@ -63,7 +63,7 @@
 
     require_login($course, false, $cm);
 
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
 
     require_capability('mod/survey:readresponses', $context);
 
diff --git a/mod/survey/save.php b/mod/survey/save.php
index 7fde436276e..334ac1c106b 100644
--- a/mod/survey/save.php
+++ b/mod/survey/save.php
@@ -47,7 +47,7 @@
     $PAGE->set_url('/mod/survey/save.php', array('id'=>$id));
     require_login($course, false, $cm);
 
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
     require_capability('mod/survey:participate', $context);
 
     if (! $survey = $DB->get_record("survey", array("id"=>$cm->instance))) {
diff --git a/mod/survey/view.php b/mod/survey/view.php
index cfb421a86db..4fce01a8eaf 100644
--- a/mod/survey/view.php
+++ b/mod/survey/view.php
@@ -38,7 +38,7 @@
 
     $PAGE->set_url('/mod/survey/view.php', array('id'=>$id));
     require_login($course, false, $cm);
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
 
     require_capability('mod/survey:participate', $context);