From 1b846984ebfec91ef4bf3286a6f3932f9dd0ef56 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Tue, 5 Dec 2023 11:02:54 +0000 Subject: [PATCH] MDL-80324 webservice: correct current page URL for user settings. --- admin/webservice/service_user_settings.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/admin/webservice/service_user_settings.php b/admin/webservice/service_user_settings.php index 8a87fdb619e..3744c19b2f9 100644 --- a/admin/webservice/service_user_settings.php +++ b/admin/webservice/service_user_settings.php @@ -33,18 +33,17 @@ $userid = required_param('userid', PARAM_INT); admin_externalpage_setup('externalserviceusersettings'); //define nav bar -$PAGE->set_url('/' . $CFG->admin . '/webservice/service_user_settings.php', - array('id' => $serviceid, 'userid' => $userid)); +$PAGE->set_url('/admin/webservice/service_user_settings.php', ['serviceid' => $serviceid, 'userid' => $userid]); $node = $PAGE->settingsnav->find('externalservices', navigation_node::TYPE_SETTING); if ($node) { $node->make_active(); } -$PAGE->navbar->add(get_string('serviceusers', 'webservice'), - new moodle_url('/' . $CFG->admin . '/webservice/service_users.php', array('id' => $serviceid))); + +$returnurl = new moodle_url('/admin/webservice/service_users.php', ['id' => $serviceid]); +$PAGE->navbar->add(get_string('serviceusers', 'webservice'), $returnurl); $PAGE->navbar->add(get_string('serviceusersettings', 'webservice')); $formaction = new moodle_url('', array('id' => $serviceid, 'userid' => $userid)); -$returnurl = new moodle_url('/' . $CFG->admin . '/webservice/service_users.php', array('id' => $serviceid)); $webservicemanager = new webservice(); $serviceuser = $webservicemanager->get_ws_authorised_user($serviceid, $userid);