Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…OODLE_21_STABLE
  • Loading branch information...
commit a24681a87a1afc466ab7703ea0eb9b7933240650 2 parents e1ad3c3 + 26a4f31
Petr Skoda skodak authored
1  mod/quiz/edit.php
View
@@ -141,7 +141,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) {
1  question/category.php
View
@@ -54,7 +54,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'));
1  question/edit.php
View
@@ -50,7 +50,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');
2  question/editlib.php
View
@@ -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
2  question/export.php
View
@@ -28,8 +28,6 @@
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');
2  question/import.php
View
@@ -42,8 +42,6 @@
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
2  question/question.php
View
@@ -103,7 +103,6 @@
$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 @@
print_error('missingcourseorcmid', 'question');
}
$contexts = new question_edit_contexts($thiscontext);
+$PAGE->set_pagelayout('admin');
if (optional_param('addcancel', false, PARAM_BOOL)) {
redirect($returnurl);
Please sign in to comment.
Something went wrong with that request. Please try again.