diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php index 0a136e846ee..14a42ac0fb6 100644 --- a/auth/mnet/auth.php +++ b/auth/mnet/auth.php @@ -378,23 +378,28 @@ class auth_plugin_mnet extends auth_plugin_base { $extra = $DB->get_records_sql($sql); $keys = array_keys($courses); - $defaultrole = reset(get_archetype_roles('student')); - //$defaultrole = get_default_course_role($ccache[$shortname]); //TODO: rewrite this completely, there is no default course role any more!!! - foreach ($keys AS $id) { - if ($courses[$id]->visible == 0) { - unset($courses[$id]); - continue; - } - $courses[$id]->cat_id = $courses[$id]->category; - $courses[$id]->defaultroleid = $defaultrole->id; - unset($courses[$id]->category); - unset($courses[$id]->visible); + $studentroles = get_archetype_roles('student'); + if (!empty($studentroles)) { + $defaultrole = reset($studentroles); + //$defaultrole = get_default_course_role($ccache[$shortname]); //TODO: rewrite this completely, there is no default course role any more!!! + foreach ($keys AS $id) { + if ($courses[$id]->visible == 0) { + unset($courses[$id]); + continue; + } + $courses[$id]->cat_id = $courses[$id]->category; + $courses[$id]->defaultroleid = $defaultrole->id; + unset($courses[$id]->category); + unset($courses[$id]->visible); - $courses[$id]->cat_name = $extra[$id]->cat_name; - $courses[$id]->cat_description = $extra[$id]->cat_description; - $courses[$id]->defaultrolename = $defaultrole->name; - // coerce to array - $courses[$id] = (array)$courses[$id]; + $courses[$id]->cat_name = $extra[$id]->cat_name; + $courses[$id]->cat_description = $extra[$id]->cat_description; + $courses[$id]->defaultrolename = $defaultrole->name; + // coerce to array + $courses[$id] = (array)$courses[$id]; + } + } else { + throw new moodle_exception('unknownrole', 'error', '', 'student'); } } else { // if the array is empty, send it anyway diff --git a/mnet/service/enrol/course.php b/mnet/service/enrol/course.php index d67eaf62bb3..632e4d36915 100644 --- a/mnet/service/enrol/course.php +++ b/mnet/service/enrol/course.php @@ -62,7 +62,7 @@ echo $OUTPUT->heading($icon . s($course->fullname)); // collapsible course summary if (!empty($course->summary)) { - unset($options); + $options = new stdClass(); $options->trusted = false; $options->para = false; $options->filter = false;