Merge branch 'MDL-65969-master' of git://github.com/jleyva/moodle

diff --combined course/externallib.php
index 8877119,072c605..69c2acd
--- 1/course/externallib.php
--- 2/course/externallib.php
+++ b/course/externallib.php
@@@ -269,6 -269,7 +269,7 @@@ class core_course_external extends exte
                          $module['afterlink'] = $cm->afterlink;
                          $module['customdata'] = json_encode($cm->customdata);
                          $module['completion'] = $cm->completion;
+                         $module['noviewlink'] = plugin_supports('mod', $cm->modname, FEATURE_NO_VIEW_LINK, false);
  
                          // Check module completion.
                          $completion = $completioninfo->is_enabled($cm);
@@@ -282,7 -283,7 +283,7 @@@
                              );
                          }
  
-                         if (!empty($cm->showdescription) or $cm->modname == 'label') {
+                         if (!empty($cm->showdescription) or $module['noviewlink']) {
                              // We want to use the external format. However from reading get_formatted_content(), $cm->content format is always FORMAT_HTML.
                              $options = array('noclean' => true);
                              list($module['description'], $descriptionformat) = external_format_text($cm->content,
@@@ -458,6 -459,8 +459,8 @@@
                                      'afterlink' => new external_value(PARAM_RAW, 'After link info to be displayed.',
                                          VALUE_OPTIONAL),
                                      'customdata' => new external_value(PARAM_RAW, 'Custom data (JSON encoded).', VALUE_OPTIONAL),
 -                                    'noviewlink' => new external_value(PARAM_BOOL, 'Whether the module does link to
 -                                        a new page.', VALUE_OPTIONAL),
++                                    'noviewlink' => new external_value(PARAM_BOOL, 'Whether the module has no view page',
++                                        VALUE_OPTIONAL),
                                      'completion' => new external_value(PARAM_INT, 'Type of completion tracking:
                                          0 means none, 1 manual, 2 automatic.', VALUE_OPTIONAL),
                                      'completiondata' => new external_single_structure(
@@@ -3741,8 -3744,6 +3744,8 @@@
          $sort = $params['sort'];
  
          switch($classification) {
 +            case COURSE_TIMELINE_ALLINCLUDINGHIDDEN:
 +                break;
              case COURSE_TIMELINE_ALL:
                  break;
              case COURSE_TIMELINE_PAST:
@@@ -3766,16 -3767,10 +3769,16 @@@
          $hiddencourses = get_hidden_courses_on_timeline();
          $courses = [];
  
 -        // If the timeline requires the hidden courses then restrict the result to only $hiddencourses else exclude.
 -        if ($classification == COURSE_TIMELINE_HIDDEN) {
 +        // If the timeline requires really all courses, get really all courses.
 +        if ($classification == COURSE_TIMELINE_ALLINCLUDINGHIDDEN) {
 +            $courses = course_get_enrolled_courses_for_logged_in_user(0, $offset, $sort, $fields, COURSE_DB_QUERY_LIMIT);
 +
 +            // Otherwise if the timeline requires the hidden courses then restrict the result to only $hiddencourses.
 +        } else if ($classification == COURSE_TIMELINE_HIDDEN) {
              $courses = course_get_enrolled_courses_for_logged_in_user(0, $offset, $sort, $fields,
                  COURSE_DB_QUERY_LIMIT, $hiddencourses);
 +
 +            // Otherwise get the requested courses and exclude the hidden courses.
          } else {
              $courses = course_get_enrolled_courses_for_logged_in_user(0, $offset, $sort, $fields,
                  COURSE_DB_QUERY_LIMIT, [], $hiddencourses);