Merge branch 'MDL-28437_20' of git://github.com/timhunt/moodle into M…

…OODLE_20_STABLE
moodle · Jul 25, 2011 · 2a41529 · 2a41529
2 parents e9adc8f + ceedbe8
commit 2a41529
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 9 deletions.
diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
@@ -142,7 +142,6 @@ function module_specific_controls($totalnumber, $recurse, $category, $cmid, $cmo
 $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
@@ -38,7 +38,6 @@
         }
     }
     $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
@@ -56,7 +56,6 @@
         $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
@@ -1546,7 +1546,7 @@ function question_edit_setup($edittab, $baseurl, $requirecmid = false, $requirec
         $contexts = null;
     }
 
-
+    $PAGE->set_pagelayout('admin');
 
     $pagevars['qpage'] = optional_param('qpage', -1, PARAM_INT);
 

diff --git a/question/export.php b/question/export.php
@@ -13,8 +13,6 @@
     require_once("editlib.php");
     require_once("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
@@ -26,8 +26,6 @@
     print_error('nocategory','quiz');
 }
 
-$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
@@ -80,14 +80,14 @@
     $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;
 } else {
     print_error('missingcourseorcmid', 'question');
 }
 $contexts = new question_edit_contexts($thiscontext);
+$PAGE->set_pagelayout('admin');
 
 if (optional_param('addcancel', false, PARAM_BOOL)) {
     redirect($returnurl);