Merge branch 'MDL-41446-master' of git://github.com/sammarshallou/moodle

[moodle.git] / lib / completionlib.php

diff --git a/lib/completionlib.php b/lib/completionlib.php
index a6caec0..b109afc 100644 (file)
--- a/lib/completionlib.php
+++ b/lib/completionlib.php
@@ -1077,7 +1077,7 @@ class completion_info {
      * Obtains a list of activities for which completion is enabled on the
      * course. The list is ordered by the section order of those activities.
      *
      * Obtains a list of activities for which completion is enabled on the
      * course. The list is ordered by the section order of those activities.
      *

-     * @return array Array from $cmid => $cm of all activities with completion enabled,
+     * @return cm_info[] Array from $cmid => $cm of all activities with completion enabled,

      *   empty array if none
      */
     public function get_activities() {
      *   empty array if none
      */
     public function get_activities() {


@@ -1150,7 +1150,8 @@ class completion_info {
                 context_course::instance($this->course->id),
                 'moodle/course:isincompletionreports', $groupid, true);
 
                 context_course::instance($this->course->id),
                 'moodle/course:isincompletionreports', $groupid, true);
 

-        $sql = 'SELECT u.id, u.firstname, u.lastname, u.idnumber';
+        $allusernames = get_all_user_name_fields(true, 'u');
+        $sql = 'SELECT u.id, u.idnumber, ' . $allusernames;

         if ($extracontext) {
             $sql .= get_extra_user_fields_sql($extracontext, 'u', '', array('idnumber'));
         }
         if ($extracontext) {
             $sql .= get_extra_user_fields_sql($extracontext, 'u', '', array('idnumber'));
         }