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

diff --combined enrol/externallib.php
index 71608df,5e555e0..593541e
--- 1/enrol/externallib.php
--- 2/enrol/externallib.php
+++ b/enrol/externallib.php
@@@ -366,6 -366,7 +366,7 @@@ class core_enrol_external extends exter
              $progress = null;
              $completed = null;
              $completionhascriteria = false;
+             $completionusertracked = false;
  
              // Return only private information if the user should be able to see it.
              if ($sameuser || completion_can_view_data($userid, $course)) {
@@@ -373,6 -374,7 +374,7 @@@
                      $completion = new completion_info($course);
                      $completed = $completion->is_course_complete($userid);
                      $completionhascriteria = $completion->has_criteria();
+                     $completionusertracked = $completion->is_tracked_user($userid);
                      $progress = \core_completion\progress::get_course_progress_percentage($course, $userid);
                  }
              }
@@@ -425,6 -427,7 +427,7 @@@
                  'lang' => clean_param($course->lang, PARAM_LANG),
                  'enablecompletion' => $course->enablecompletion,
                  'completionhascriteria' => $completionhascriteria,
+                 'completionusertracked' => $completionusertracked,
                  'category' => $course->category,
                  'progress' => $progress,
                  'completed' => $completed,
@@@ -470,6 -473,7 +473,7 @@@
                      'enablecompletion' => new external_value(PARAM_BOOL, 'true if completion is enabled, otherwise false',
                                                                  VALUE_OPTIONAL),
                      'completionhascriteria' => new external_value(PARAM_BOOL, 'If completion criteria is set.', VALUE_OPTIONAL),
+                     'completionusertracked' => new external_value(PARAM_BOOL, 'If the user is completion tracked.', VALUE_OPTIONAL),
                      'category' => new external_value(PARAM_INT, 'course category id', VALUE_OPTIONAL),
                      'progress' => new external_value(PARAM_FLOAT, 'Progress percentage', VALUE_OPTIONAL),
                      'completed' => new external_value(PARAM_BOOL, 'Whether the course is completed.', VALUE_OPTIONAL),
@@@ -876,7 -880,8 +880,7 @@@
          self::validate_context(context_system::instance());
  
          $course = $DB->get_record('course', array('id' => $params['courseid']), '*', MUST_EXIST);
 -        $context = context_course::instance($course->id);
 -        if (!$course->visible and !has_capability('moodle/course:viewhiddencourses', $context)) {
 +        if (!core_course_category::can_view_course_info($course) && !can_access_course($course)) {
              throw new moodle_exception('coursehidden');
          }