From 726fd6db19a187e789648567063a9f22f4cd4f5a Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Tue, 2 Jul 2013 10:43:41 +0100 Subject: [PATCH] MDL-40318 quiz intro comprising just an impage was not shown Also, ensure that we don't output an empty box if there are no access messages. --- mod/quiz/renderer.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/mod/quiz/renderer.php b/mod/quiz/renderer.php index 7937ebdb82f..80202e2d9f4 100644 --- a/mod/quiz/renderer.php +++ b/mod/quiz/renderer.php @@ -835,14 +835,15 @@ class mod_quiz_renderer extends plugin_renderer_base { global $CFG; $output = ''; + // Print quiz name and description. $output .= $this->heading(format_string($quiz->name)); - if (trim(strip_tags($quiz->intro))) { - $output .= $this->box(format_module_intro('quiz', $quiz, $cm->id), 'generalbox', - 'intro'); - } + $output .= $this->quiz_intro($quiz, $cm); - $output .= $this->box($this->access_messages($messages), 'quizinfo'); + // Output any access messages. + if ($messages) { + $output .= $this->box($this->access_messages($messages), 'quizinfo'); + } // Show number of attempts summary to those who can view reports. if (has_capability('mod/quiz:viewreports', $context)) { @@ -862,13 +863,11 @@ class mod_quiz_renderer extends plugin_renderer_base { * @return string HTML to output. */ public function quiz_intro($quiz, $cm) { - if (trim(strip_tags($quiz->intro))) { - return $this->box(format_module_intro('quiz', $quiz, $cm->id), - 'generalbox', 'intro'); - - } else { + if (html_is_blank($quiz->intro)) { return ''; } + + return $this->box(format_module_intro('quiz', $quiz, $cm->id), 'generalbox', 'intro'); } /**