From 9dd0fe18a89dfe42a50b52154973b37c2c3348c8 Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Mon, 7 Aug 2017 10:52:00 +0800
Subject: [PATCH] MDL-57188 course: correct return url to manage page

---
 course/classes/management/helper.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/course/classes/management/helper.php b/course/classes/management/helper.php
index 94b6638d826..c5273f38b74 100644
--- a/course/classes/management/helper.php
+++ b/course/classes/management/helper.php
@@ -168,8 +168,8 @@ class helper {
      * @return array
      */
     public static function get_category_listitem_actions(\coursecat $category) {
-        global $PAGE;
-        $baseurl = new \moodle_url('/course/management.php', array('categoryid' => $category->id, 'sesskey' => \sesskey()));
+        $manageurl = new \moodle_url('/course/management.php', array('categoryid' => $category->id));
+        $baseurl = new \moodle_url($manageurl, array('sesskey' => \sesskey()));
         $actions = array();
         // Edit.
         if ($category->can_edit()) {
@@ -254,7 +254,7 @@ class helper {
         if ($category->can_review_roles()) {
             $actions['assignroles'] = array(
                 'url' => new \moodle_url('/admin/roles/assign.php', array('contextid' => $category->get_context()->id,
-                    'returnurl' => $PAGE->url->out_as_local_url(false))),
+                    'returnurl' => $manageurl->out_as_local_url(false))),
                 'icon' => new \pix_icon('t/assignroles', new \lang_string('assignroles', 'role')),
                 'string' => new \lang_string('assignroles', 'role')
             );
@@ -264,7 +264,7 @@ class helper {
         if ($category->can_review_permissions()) {
             $actions['permissions'] = array(
                 'url' => new \moodle_url('/admin/roles/permissions.php', array('contextid' => $category->get_context()->id,
-                    'returnurl' => $PAGE->url->out_as_local_url(false))),
+                    'returnurl' => $manageurl->out_as_local_url(false))),
                 'icon' => new \pix_icon('i/permissions', new \lang_string('permissions', 'role')),
                 'string' => new \lang_string('permissions', 'role')
             );
@@ -274,7 +274,7 @@ class helper {
         if ($category->can_review_permissions()) {
             $actions['checkroles'] = array(
                 'url' => new \moodle_url('/admin/roles/check.php', array('contextid' => $category->get_context()->id,
-                    'returnurl' => $PAGE->url->out_as_local_url(false))),
+                    'returnurl' => $manageurl->out_as_local_url(false))),
                 'icon' => new \pix_icon('i/checkpermissions', new \lang_string('checkpermissions', 'role')),
                 'string' => new \lang_string('checkpermissions', 'role')
             );