mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 00:16:46 +02:00
NAVIGATION MDL-25468 remove optional_param from navigationlib.php, use override_active_url to help find the correct node
This commit is contained in:
parent
eef3578af0
commit
100e0d4989
3 changed files with 4 additions and 19 deletions
|
@ -37,9 +37,7 @@ $hide = optional_param('hide', 0, PARAM_INT);
|
|||
$courseid = optional_param('courseid', SITEID, PARAM_INT);
|
||||
|
||||
$url = new moodle_url('/user/portfolio.php', array('courseid'=>$courseid));
|
||||
if ($hide !== 0) {
|
||||
$url->param('hide', $hide);
|
||||
}
|
||||
|
||||
if ($config !== 0) {
|
||||
$url->param('config', $config);
|
||||
}
|
||||
|
@ -69,6 +67,7 @@ echo $OUTPUT->header();
|
|||
$showroles = 1;
|
||||
|
||||
if (!empty($config)) {
|
||||
navigation_node::override_active_url(new moodle_url('/user/portfolio.php', array('courseid'=>$courseid)));
|
||||
$instance = portfolio_instance($config);
|
||||
$mform = new portfolio_user_form('', array('instance' => $instance, 'userid' => $user->id));
|
||||
if ($mform->is_cancelled()){
|
||||
|
|
|
@ -48,6 +48,8 @@ $strportfolios = get_string('portfolios', 'portfolio');
|
|||
|
||||
$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) {
|
||||
$url->param('page', $page);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue