Merge branch 'MDL-61520-33' of git://github.com/lameze/moodle into MO…

…ODLE_33_STABLE
moodle · Apr 18, 2018 · 07f6d89 · 07f6d89
2 parents 132ea1c + 5155bf1
commit 07f6d89
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/mod/quiz/report/responses/last_responses_table.php b/mod/quiz/report/responses/last_responses_table.php
@@ -90,7 +90,7 @@ public function data_col($slot, $field, $attempt) {
             $summary = trim($value);
         }
 
-        if ($this->is_downloading() && $this->is_downloading() != 'xhtml') {
+        if ($this->is_downloading() && $this->is_downloading() != 'html') {
             return $summary;
         }
         $summary = s($summary);

diff --git a/mod/quiz/report/statistics/report.php b/mod/quiz/report/statistics/report.php
@@ -190,7 +190,7 @@ public function display($quiz, $cm, $course) {
             if ($quizstats->s()) {
                 $this->output_quiz_structure_analysis_table($questionstats);
 
-                if ($this->table->is_downloading() == 'xhtml' && $quizstats->s() != 0) {
+                if ($this->table->is_downloading() == 'html' && $quizstats->s() != 0) {
                     $this->output_statistics_graph($quiz->id, $qubaids);
                 }
 
@@ -403,14 +403,14 @@ protected function output_individual_question_response_analysis($question, $vari
                 $questiontabletitle = get_string('analysisnameonly', 'quiz_statistics', $a);
             }
 
-            if ($this->table->is_downloading() == 'xhtml') {
+            if ($this->table->is_downloading() == 'html') {
                 $questiontabletitle = get_string('analysisofresponsesfor', 'quiz_statistics', $questiontabletitle);
             }
 
             // Set up the table.
             $exportclass->start_table($questiontabletitle);
 
-            if ($this->table->is_downloading() == 'xhtml') {
+            if ($this->table->is_downloading() == 'html') {
                 echo $this->render_question_text($question);
             }
         }
@@ -487,8 +487,8 @@ protected function output_quiz_info_table($quizinfo) {
     protected function download_quiz_info_table($quizinfo) {
         global $OUTPUT;
 
-        // XHTML download is a special case.
-        if ($this->table->is_downloading() == 'xhtml') {
+        // HTML download is a special case.
+        if ($this->table->is_downloading() == 'html') {
             echo $OUTPUT->heading(get_string('quizinformation', 'quiz_statistics'), 3);
             echo $this->output_quiz_info_table($quizinfo);
             return;