Merge branch 'MDL-50314_master' of git://github.com/do-you-even-curl/…

…moodle
moodle · Sep 12, 2018 · 8258509 · 8258509
2 parents db5057d + 3a33d51
commit 8258509
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/mod/quiz/report/attemptsreport.php b/mod/quiz/report/attemptsreport.php
@@ -202,25 +202,11 @@ protected function add_user_columns($table, &$columns, &$headers) {
             $headers[] = get_string('firstname');
         }
 
-        // When downloading, some extra fields are always displayed (because
-        // there's no space constraint) so do not include in extra-field list.
-        $extrafields = get_extra_user_fields($this->context,
-                $table->is_downloading() ? array('institution', 'department', 'email') : array());
+        $extrafields = get_extra_user_fields($this->context);
         foreach ($extrafields as $field) {
             $columns[] = $field;
             $headers[] = get_user_field_name($field);
         }
-
-        if ($table->is_downloading()) {
-            $columns[] = 'institution';
-            $headers[] = get_string('institution');
-
-            $columns[] = 'department';
-            $headers[] = get_string('department');
-
-            $columns[] = 'email';
-            $headers[] = get_string('email');
-        }
     }
 
     /**