From 84d1f3c078b4231b33b584fa12b00c1159003a3d Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Wed, 2 Jun 2021 22:41:49 +0100
Subject: [PATCH] MDL-71844 tool_task: preserve navigation when executing task.

---
 admin/tool/task/schedule_task.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/admin/tool/task/schedule_task.php b/admin/tool/task/schedule_task.php
index 3c5aa2e5465..777de450c6e 100644
--- a/admin/tool/task/schedule_task.php
+++ b/admin/tool/task/schedule_task.php
@@ -59,10 +59,14 @@ if (!$task) {
 }
 
 // Start output.
-$PAGE->set_url(new moodle_url('/admin/tool/task/schedule_task.php'));
+$PAGE->set_url(new moodle_url('/admin/tool/task/schedule_task.php', ['task' => $taskname]));
 $PAGE->set_context($context);
-$PAGE->navbar->add(get_string('scheduledtasks', 'tool_task'), new moodle_url('/admin/tool/task/scheduledtasks.php'));
+$PAGE->set_heading($SITE->fullname);
+$PAGE->set_title($task->get_name());
+
+navigation_node::override_active_url(new moodle_url('/admin/tool/task/scheduledtasks.php'));
 $PAGE->navbar->add(s($task->get_name()));
+
 echo $OUTPUT->header();
 echo $OUTPUT->heading($task->get_name());