moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-03 16:13:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

NAVIGATION MDL-25468 remove optional_param from navigationlib.php, use override_active_url to help find the correct node

Browse source
This commit is contained in:
Dongsheng Cai 2011-02-07 16:25:58 +08:00
parent eef3578af0
commit 100e0d4989
3 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/navigationlib.php
View file

@ -3398,26 +3398,10 @@ class settings_navigation extends navigation_node {
if (portfolio_instances(true, false)) { if (portfolio_instances(true, false)) {
$portfolio = $usersetting->add(get_string('portfolios', 'portfolio'), null, self::TYPE_SETTING); $portfolio = $usersetting->add(get_string('portfolios', 'portfolio'), null, self::TYPE_SETTING);
$config = optional_param('config', 0, PARAM_INT);
$hide = optional_param('hide', 0, PARAM_INT);
$url = new moodle_url('/user/portfolio.php', array('courseid'=>$course->id)); $url = new moodle_url('/user/portfolio.php', array('courseid'=>$course->id));
if ($hide !== 0) {
$url->param('hide', $hide);
}
if ($config !== 0) {
$url->param('config', $config);
}
$portfolio->add(get_string('configure', 'portfolio'), $url, self::TYPE_SETTING); $portfolio->add(get_string('configure', 'portfolio'), $url, self::TYPE_SETTING);
$page = optional_param('page', 0, PARAM_INT);
$perpage = optional_param('perpage', 10, PARAM_INT);
$url = new moodle_url('/user/portfoliologs.php', array('courseid'=>$course->id)); $url = new moodle_url('/user/portfoliologs.php', array('courseid'=>$course->id));
if ($page !== 0) {
$url->param('page', $page);
}
if ($perpage !== 0) {
$url->param('perpage', $perpage);
}
$portfolio->add(get_string('logs', 'portfolio'), $url, self::TYPE_SETTING); $portfolio->add(get_string('logs', 'portfolio'), $url, self::TYPE_SETTING);
} }
} }

5
user/portfolio.php
View file

@ -37,9 +37,7 @@ $hide = optional_param('hide', 0, PARAM_INT);
$courseid = optional_param('courseid', SITEID, PARAM_INT); $courseid = optional_param('courseid', SITEID, PARAM_INT);
$url = new moodle_url('/user/portfolio.php', array('courseid'=>$courseid)); $url = new moodle_url('/user/portfolio.php', array('courseid'=>$courseid));
if ($hide !== 0) {
$url->param('hide', $hide);
}
if ($config !== 0) { if ($config !== 0) {
$url->param('config', $config); $url->param('config', $config);
} }
@ -69,6 +67,7 @@ echo $OUTPUT->header();
$showroles = 1; $showroles = 1;
if (!empty($config)) { if (!empty($config)) {
navigation_node::override_active_url(new moodle_url('/user/portfolio.php', array('courseid'=>$courseid)));
$instance = portfolio_instance($config); $instance = portfolio_instance($config);
$mform = new portfolio_user_form('', array('instance' => $instance, 'userid' => $user->id)); $mform = new portfolio_user_form('', array('instance' => $instance, 'userid' => $user->id));
if ($mform->is_cancelled()){ if ($mform->is_cancelled()){

2
user/portfoliologs.php
View file

@ -48,6 +48,8 @@ $strportfolios = get_string('portfolios', 'portfolio');
$url = new moodle_url('/user/portfoliologs.php', array('courseid'=>$courseid)); $url = new moodle_url('/user/portfoliologs.php', array('courseid'=>$courseid));
navigation_node::override_active_url(new moodle_url('/user/portfoliologs.php', array('courseid'=>$courseid)));
if ($page !== 0) { if ($page !== 0) {
$url->param('page', $page); $url->param('page', $page);
} }