From: tjhunt Date: Tue, 25 Mar 2008 19:40:42 +0000 (+0000) Subject: MDL-13806 - supplimental - bug fixes to the previous commit. X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=44266ca4efa19e7ef8c0f97252972364725d0e31;p=moodle.git MDL-13806 - supplimental - bug fixes to the previous commit. --- diff --git a/mod/quiz/accessrules.php b/mod/quiz/accessrules.php index 9e0b1641ac..fdd6ef995c 100644 --- a/mod/quiz/accessrules.php +++ b/mod/quiz/accessrules.php @@ -605,6 +605,7 @@ class password_access_rule extends quiz_access_rule_base { print_header('', '', '', 'quizpassword'); } if (trim(strip_tags($this->_quiz->intro))) { + $formatoptions = new stdClass; $formatoptions->noclean = true; $output .= print_box(format_text($this->_quiz->intro, FORMAT_MOODLE, $formatoptions), 'generalbox', 'intro', true); @@ -696,7 +697,7 @@ class securewindow_access_rule extends quiz_access_rule_base { public function make_review_link($linktext, $attemptid) { global $CFG; return link_to_popup_window($CFG->wwwroot . '/mod/quiz/review.php?q=' . $this->_quiz->id . - '&attempt=' . $attemptid, 'quizpopup', $linktext, '', '', '', $windowoptions, true); + '&attempt=' . $attemptid, 'quizpopup', $linktext, '', '', '', $this->windowoptions, true); } /** diff --git a/mod/quiz/review.php b/mod/quiz/review.php index 15a9f15f95..c6bf8deebd 100644 --- a/mod/quiz/review.php +++ b/mod/quiz/review.php @@ -52,9 +52,6 @@ if (!$attempt->timefinish) { redirect($CFG->wwwroot . '/mod/quiz/attempt.php?q=' . $quiz->id); } - if ($messages = $accessmanager->prevent_review($options)) { - - } /// Can't review other users' attempts. if (!$reviewofownattempt) { quiz_error($quiz, 'reviewnotallowed');