From daf0f79aa80c2da5ece6d27b7175b9cbc46fedee Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Mon, 2 Aug 2010 12:17:25 +0000 Subject: [PATCH] MDL-23613 fixed one more wrong PAGE->context --- filter/manage.php | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/filter/manage.php b/filter/manage.php index 7df6d709c5d..6e658955032 100644 --- a/filter/manage.php +++ b/filter/manage.php @@ -29,7 +29,11 @@ require_once($CFG->libdir . '/adminlib.php'); $contextid = required_param('contextid',PARAM_INT); $forfilter = optional_param('filter', '', PARAM_SAFEPATH); -$context = get_context_instance_by_id($contextid, MUST_EXIST); +list($context, $course, $cm) = get_context_info_array($contextid); + +/// Check login and permissions. +require_login($course, false, $cm); +require_capability('moodle/filter:manage', $context); $args = array('contextid'=>$contextid); $baseurl = new moodle_url('/filter/manage.php', $args); @@ -44,30 +48,24 @@ if (!in_array($context->contextlevel, array(CONTEXT_COURSECAT, CONTEXT_COURSE, C } $isfrontpage = ($context->contextlevel == CONTEXT_COURSE && $context->instanceid == SITEID); + $contextname = print_context_name($context); -$cm = null; if ($context->contextlevel == CONTEXT_COURSECAT) { - $course = clone($SITE); $heading = "$SITE->fullname: ".get_string("categories"); - $PAGE->set_heading(); } else if ($context->contextlevel == CONTEXT_COURSE) { - $course = $DB->get_record('course', array('id' => $context->instanceid), '*', MUST_EXIST); $heading = $course->fullname; -} else { +} else if ($context->contextlevel == CONTEXT_MODULE) { // Must be module context. - $cm = get_coursemodule_from_id(null, $context->instanceid, false, 0, MUST_EXIST); - $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST); + $heading = $PAGE->activityrecord->name; +} else { + $heading = ''; } /// Check login and permissions. require_login($course, false, $cm); require_capability('moodle/filter:manage', $context); -if ($cm) { - $heading = $PAGE->activityrecord->name; -} - $PAGE->set_context($context); $PAGE->set_heading($heading);