Merge branch 'MDL-30683_21' of git://github.com/timhunt/moodle into M…

…OODLE_21_STABLE
moodle · Dec 19, 2011 · 0bc0394 · 0bc0394
2 parents f158171 + 88c2d10
commit 0bc0394
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/mod/quiz/report/attemptsreport.php b/mod/quiz/report/attemptsreport.php
@@ -298,15 +298,16 @@ protected function add_time_columns(&$columns, &$headers) {
      * @param object $quiz the quiz settings.
      * @param array $columns the list of columns. Added to.
      * @param array $headers the columns headings. Added to.
+     * @param bool $includefeedback whether to include the feedbacktext columns
      */
-    protected function add_grade_columns($quiz, &$columns, &$headers) {
+    protected function add_grade_columns($quiz, &$columns, &$headers, $includefeedback = true) {
         if ($this->should_show_grades($quiz)) {
             $columns[] = 'sumgrades';
             $headers[] = get_string('grade', 'quiz') . '/' .
                     quiz_format_grade($quiz, $quiz->grade);
         }
 
-        if (quiz_has_feedback($quiz)) {
+        if ($includefeedback && quiz_has_feedback($quiz)) {
             $columns[] = 'feedbacktext';
             $headers[] = get_string('feedback', 'quiz');
         }

diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
@@ -319,7 +319,7 @@ public function display($quiz, $cm, $course) {
                 $headers[] = get_string('regrade', 'quiz_overview');
             }
 
-            $this->add_grade_columns($quiz, $columns, $headers);
+            $this->add_grade_columns($quiz, $columns, $headers, false);
 
             $this->set_up_table_columns(
                     $table, $columns, $headers, $reporturl, $displayoptions, false);