From 26a4f319a8f057845cca3082abc7022bcadd8348 Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Mon, 25 Jul 2011 08:50:06 +0100
Subject: [PATCH] MDL-28437 Question bank pages should all use General type:
 admin.

---
 mod/quiz/edit.php     | 1 -
 question/category.php | 1 -
 question/edit.php     | 1 -
 question/editlib.php  | 2 ++
 question/export.php   | 2 --
 question/import.php   | 2 --
 question/question.php | 2 +-
 7 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 5207b4b87a9..df4668aa367 100644
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -141,7 +141,6 @@ if ($quiz_reordertool > -1) {
 $quizhasattempts = quiz_has_attempts($quiz->id);
 
 $PAGE->set_url($thispageurl);
-$PAGE->set_pagelayout('admin');
 
 $pagetitle = get_string('editingquiz', 'quiz');
 if ($quiz_reordertool) {
diff --git a/question/category.php b/question/category.php
index 8b43360dc93..5ad3de94049 100644
--- a/question/category.php
+++ b/question/category.php
@@ -54,7 +54,6 @@ foreach ((array)$param as $key=>$value) {
     }
 }
 $PAGE->set_url($url);
-$PAGE->set_pagelayout('standard');
 
 $qcobject = new question_category_object($pagevars['cpage'], $thispageurl, $contexts->having_one_edit_tab_cap('categories'), $param->edit, $pagevars['cat'], $param->delete,
                             $contexts->having_cap('moodle/question:add'));
diff --git a/question/edit.php b/question/edit.php
index 5373a89f4e6..c52b4a43299 100644
--- a/question/edit.php
+++ b/question/edit.php
@@ -50,7 +50,6 @@ if (($cmid = optional_param('cmid', 0, PARAM_INT)) !== 0) {
     $url->param('cmid', $cmid);
 }
 $PAGE->set_url($url);
-$PAGE->set_pagelayout('standard');
 
 list($thispageurl, $contexts, $cmid, $cm, $module, $pagevars) =
         question_edit_setup('questions', '/question/edit.php');
diff --git a/question/editlib.php b/question/editlib.php
index d7c082a2776..27f74a69f8d 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -1605,6 +1605,8 @@ function question_edit_setup($edittab, $baseurl, $requirecmid = false, $requirec
         $contexts = null;
     }
 
+    $PAGE->set_pagelayout('admin');
+
     $pagevars['qpage'] = optional_param('qpage', -1, PARAM_INT);
 
     //pass 'cat' from page to page and when 'category' comes from a drop down menu
diff --git a/question/export.php b/question/export.php
index dec240ae354..172afa5fb80 100644
--- a/question/export.php
+++ b/question/export.php
@@ -28,8 +28,6 @@ require_once(dirname(__FILE__) . '/../config.php');
 require_once($CFG->dirroot . '/question/editlib.php');
 require_once($CFG->dirroot . '/question/export_form.php');
 
-$PAGE->set_pagelayout('standard');
-
 list($thispageurl, $contexts, $cmid, $cm, $module, $pagevars) =
         question_edit_setup('export', '/question/export.php');
 
diff --git a/question/import.php b/question/import.php
index 444d32fd169..0001e1ae208 100644
--- a/question/import.php
+++ b/question/import.php
@@ -42,8 +42,6 @@ if (!$category = $DB->get_record("question_categories", array('id' => $catid)))
     print_error('nocategory', 'question');
 }
 
-$PAGE->set_pagelayout('standard');
-
 $categorycontext = get_context_instance_by_id($category->contextid);
 $category->context = $categorycontext;
 //this page can be called without courseid or cmid in which case
diff --git a/question/question.php b/question/question.php
index 1a7ec15af5c..896a3d1739b 100644
--- a/question/question.php
+++ b/question/question.php
@@ -103,7 +103,6 @@ if ($cmid){
     $thiscontext = get_context_instance(CONTEXT_MODULE, $cmid);
 } elseif ($courseid) {
     require_login($courseid, false);
-    $PAGE->set_pagelayout('course');
     $thiscontext = get_context_instance(CONTEXT_COURSE, $courseid);
     $module = null;
     $cm = null;
@@ -111,6 +110,7 @@ if ($cmid){
     print_error('missingcourseorcmid', 'question');
 }
 $contexts = new question_edit_contexts($thiscontext);
+$PAGE->set_pagelayout('admin');
 
 if (optional_param('addcancel', false, PARAM_BOOL)) {
     redirect($returnurl);