Index: moodle/mod/lamslesson/lib.php
===================================================================
diff -u -r0ef795fd4bdb5b139a36e0fb45b3fedfc17f6bc5 -r273e0709e68cb41df7fe41f1be07add6f25f69c6
--- moodle/mod/lamslesson/lib.php	(.../lib.php)	(revision 0ef795fd4bdb5b139a36e0fb45b3fedfc17f6bc5)
+++ moodle/mod/lamslesson/lib.php	(.../lib.php)	(revision 273e0709e68cb41df7fe41f1be07add6f25f69c6)
@@ -499,7 +499,8 @@
   $monitorlnamestr = '';
   $monitoremailstr = '';
 
-  $context = get_context_instance(CONTEXT_MODULE, $form->coursemodule);
+  // $context = get_context_instance(CONTEXT_MODULE, $form->coursemodule);
+  $context = context_module::instance($form->coursemodule);
 	
   if (!$form->groupingid) {  // get all course members
     $userids = lamslesson_get_course_userids($form->coursemodule, $context);
@@ -754,14 +755,17 @@
 		if (! $cm = get_coursemodule_from_instance('lamslesson', $lamslesson->id, $lamslesson->course)) {
 			error('Course Module ID was incorrect');
 		}
-		$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+		// $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+		$context = context_module::instance($cm->id);
 	}
 	
 	// we are looking for all users assigned in this context or higher
 	if ($usercontexts = $context->get_parent_context_ids($context)) {
 		$listofcontexts = '('.implode(',', $usercontexts).')';
 	} else {
-		$sitecontext = get_context_instance(CONTEXT_SYSTEM);
+		// $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+		$sitecontext = context_system::instance();
+
 		$listofcontexts = '('.$sitecontext->id.')'; // must be site
 	}
 	$sql = "SELECT u.id