From 45e5fbe11ecd003ee70bc234efc1b40000d6c0b1 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Wed, 17 Aug 2011 14:40:05 +0100 Subject: [PATCH] MDL-28976 quiz was passing 0 to ->attempt_url when it should have been null. There was also one other incorrect call that is fixed in this commit. --- mod/quiz/attempt.php | 2 +- mod/quiz/processattempt.php | 4 ++-- mod/quiz/renderer.php | 4 ++-- mod/quiz/review.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php index 0bbd37f0106..5cc2f890ff4 100644 --- a/mod/quiz/attempt.php +++ b/mod/quiz/attempt.php @@ -42,7 +42,7 @@ $attemptid = required_param('attempt', PARAM_INT); $page = optional_param('page', 0, PARAM_INT); $attemptobj = quiz_attempt::create($attemptid); -$PAGE->set_url($attemptobj->attempt_url(0, $page)); +$PAGE->set_url($attemptobj->attempt_url(null, $page)); // Check login. require_login($attemptobj->get_course(), false, $attemptobj->get_cm()); diff --git a/mod/quiz/processattempt.php b/mod/quiz/processattempt.php index 79da3010512..7c25b7a8f0d 100644 --- a/mod/quiz/processattempt.php +++ b/mod/quiz/processattempt.php @@ -57,7 +57,7 @@ if ($next) { if ($page == -1) { $nexturl = $attemptobj->summary_url(); } else { - $nexturl = $attemptobj->attempt_url(0, $page); + $nexturl = $attemptobj->attempt_url(null, $page); if ($scrollpos !== '') { $nexturl->param('scrollpos', $scrollpos); } @@ -96,7 +96,7 @@ if (!$finishattempt) { $attemptobj->process_all_actions($timenow); } catch (question_out_of_sequence_exception $e) { print_error('submissionoutofsequencefriendlymessage', 'question', - $attemptobj->attempt_url(0, $thispage)); + $attemptobj->attempt_url(null, $thispage)); } $transaction->allow_commit(); redirect($nexturl); diff --git a/mod/quiz/renderer.php b/mod/quiz/renderer.php index 49d2cb3b608..a3c6c2c66b1 100644 --- a/mod/quiz/renderer.php +++ b/mod/quiz/renderer.php @@ -417,8 +417,8 @@ class mod_quiz_renderer extends plugin_renderer_base { // Print all the questions foreach ($slots as $slot) { - $output .= $attemptobj->render_question($slot, false, $attemptobj->attempt_url($id, - $page)); + $output .= $attemptobj->render_question($slot, false, + $attemptobj->attempt_url($slot, $page)); } $output .= html_writer::start_tag('div', array('class' => 'submitbtns')); diff --git a/mod/quiz/review.php b/mod/quiz/review.php index cd36bd92d98..b744e059c1f 100644 --- a/mod/quiz/review.php +++ b/mod/quiz/review.php @@ -57,7 +57,7 @@ $options = $attemptobj->get_display_options(true); // Check permissions. if ($attemptobj->is_own_attempt()) { if (!$attemptobj->is_finished()) { - redirect($attemptobj->attempt_url(0, $page)); + redirect($attemptobj->attempt_url(null, $page)); } else if (!$options->attempt) { $accessmanager->back_to_view_page($attemptobj->is_preview_user(), $accessmanager->cannot_review_message($attemptobj->get_attempt_state())); -- 2.43.0