From 4abc5a1a2c2755d9f7ea60e7ae53d2f2007e33c5 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 5 Oct 2012 13:10:06 +0200 Subject: [PATCH] Revert "MDL-34257 quiz 'secure' mode: PAGE initialisation order issues." This reverts commit d205afe662ba306833a525d87714d1994467dba7. --- mod/quiz/attempt.php | 4 ++-- mod/quiz/review.php | 3 +-- mod/quiz/summary.php | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php index 1cbda08f9f8..135ae1484f6 100644 --- a/mod/quiz/attempt.php +++ b/mod/quiz/attempt.php @@ -76,9 +76,8 @@ if ($attemptobj->is_finished()) { // Check the access rules. $accessmanager = $attemptobj->get_access_manager(time()); -$accessmanager->setup_attempt_page($PAGE); -$output = $PAGE->get_renderer('mod_quiz'); $messages = $accessmanager->prevent_access(); +$output = $PAGE->get_renderer('mod_quiz'); if (!$attemptobj->is_preview_user() && $messages) { print_error('attempterror', 'quiz', $attemptobj->view_url(), $output->access_messages($messages)); @@ -121,6 +120,7 @@ $title = get_string('attempt', 'quiz', $attemptobj->get_attempt_number()); $headtags = $attemptobj->get_html_head_contributions($page); $PAGE->set_title(format_string($attemptobj->get_quiz_name())); $PAGE->set_heading($attemptobj->get_course()->fullname); +$accessmanager->setup_attempt_page($PAGE); if ($attemptobj->is_last_page($page)) { $nextpage = -1; diff --git a/mod/quiz/review.php b/mod/quiz/review.php index eacc703e27b..c19afaa8970 100644 --- a/mod/quiz/review.php +++ b/mod/quiz/review.php @@ -52,8 +52,6 @@ $attemptobj->check_review_capability(); // Create an object to manage all the other (non-roles) access rules. $accessmanager = $attemptobj->get_access_manager(time()); -$accessmanager->setup_attempt_page($PAGE); - $options = $attemptobj->get_display_options(true); // Check permissions. @@ -105,6 +103,7 @@ if ($attemptobj->is_preview_user() && $attemptobj->is_own_attempt()) { $headtags = $attemptobj->get_html_head_contributions($page, $showall); $PAGE->set_title(format_string($attemptobj->get_quiz_name())); $PAGE->set_heading($attemptobj->get_course()->fullname); +$accessmanager->setup_attempt_page($PAGE); // Summary table start. ============================================================================ diff --git a/mod/quiz/summary.php b/mod/quiz/summary.php index 822e30777d0..303638f013c 100644 --- a/mod/quiz/summary.php +++ b/mod/quiz/summary.php @@ -52,9 +52,8 @@ if ($attemptobj->is_preview_user()) { // Check access. $accessmanager = $attemptobj->get_access_manager(time()); -$accessmanager->setup_attempt_page($PAGE); -$output = $PAGE->get_renderer('mod_quiz'); $messages = $accessmanager->prevent_access(); +$output = $PAGE->get_renderer('mod_quiz'); if (!$attemptobj->is_preview_user() && $messages) { print_error('attempterror', 'quiz', $attemptobj->view_url(), $output->access_messages($messages)); @@ -90,6 +89,7 @@ $PAGE->blocks->add_fake_block($navbc, reset($regions)); $PAGE->navbar->add(get_string('summaryofattempt', 'quiz')); $PAGE->set_title(format_string($attemptobj->get_quiz_name())); $PAGE->set_heading($attemptobj->get_course()->fullname); +$accessmanager->setup_attempt_page($PAGE); // Display the page. echo $output->summary_page($attemptobj, $displayoptions); -- 2.43.0