mod_quiz MDL-26178 it let you try to preview a quiz with several empt…

…y pages. You should not be allowed to preview an empty quiz, to make it correctly detect this case.
moodle · Jan 29, 2011 · 2cb01c9 · 2cb01c9
1 parent 8cdc85a
commit 2cb01c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mod/quiz/attemptlib.php b/mod/quiz/attemptlib.php
@@ -375,14 +375,14 @@ protected function determine_layout() {
         $this->pagequestionids = array();
 
         // Get the appropriate layout string (from quiz or attempt).
-        $layout = $this->get_layout_string();
+        $layout = quiz_clean_layout($this->get_layout_string(), true);
         if (empty($layout)) {
             // Nothing to do.
             return;
         }
 
         // Break up the layout string into pages.
-        $pagelayouts = explode(',0', quiz_clean_layout($layout, true));
+        $pagelayouts = explode(',0', $layout);
 
         // Strip off any empty last page (normally there is one).
         if (end($pagelayouts) == '') {

diff --git a/mod/quiz/view.php b/mod/quiz/view.php
@@ -339,7 +339,7 @@
 /// or a button to go back to the course page.
     echo $OUTPUT->box_start('quizattempt');
     $buttontext = ''; // This will be set something if as start/continue attempt button should appear.
-    if (!$quiz->questions) {
+    if (!quiz_clean_layout($quiz->questions, true)) {
         echo $OUTPUT->heading(get_string("noquestions", "quiz"));
     } else {
         if ($unfinished) {