From f46fe1e78e4975acfb9735b993f4012b82b74aea Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Sun, 5 Mar 2023 20:06:40 +0000
Subject: [PATCH] MDL-77472 grade: correct URL param type for adding tracking
 params.

---
 grade/edit/tree/item.php        | 4 ++--
 grade/edit/tree/outcomeitem.php | 2 +-
 grade/lib.php                   | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/grade/edit/tree/item.php b/grade/edit/tree/item.php
index 5f96e8cbd6d..a50ea08f2f0 100644
--- a/grade/edit/tree/item.php
+++ b/grade/edit/tree/item.php
@@ -57,12 +57,12 @@ $heading = get_string('itemsedit', 'grades');
 if ($grade_item = grade_item::fetch(array('id'=>$id, 'courseid'=>$courseid))) {
     // redirect if outcomeid present
     if (!empty($grade_item->outcomeid) && !empty($CFG->enableoutcomes)) {
-        $url = $CFG->wwwroot.'/grade/edit/tree/outcomeitem.php?id='.$id.'&amp;courseid='.$courseid;
+        $url = new moodle_url('/grade/edit/tree/outcomeitem.php', ['id' => $id, 'courseid' => $courseid]);
         redirect($gpr->add_url_params($url));
     }
     if ($grade_item->is_course_item() or $grade_item->is_category_item()) {
         $grade_category = $grade_item->get_item_category();
-        $url = $CFG->wwwroot.'/grade/edit/tree/category.php?id='.$grade_category->id.'&amp;courseid='.$courseid;
+        $url = new moodle_url('/grade/edit/tree/category.php', ['id' => $grade_category->id, 'courseid' => $courseid]);
         redirect($gpr->add_url_params($url));
     }
 
diff --git a/grade/edit/tree/outcomeitem.php b/grade/edit/tree/outcomeitem.php
index ed5dbed2d69..dd5185cc7ed 100644
--- a/grade/edit/tree/outcomeitem.php
+++ b/grade/edit/tree/outcomeitem.php
@@ -63,7 +63,7 @@ $heading = get_string('outcomeitemsedit', 'grades');
 if ($grade_item = grade_item::fetch(array('id'=>$id, 'courseid'=>$courseid))) {
     // redirect if outcomeid present
     if (empty($grade_item->outcomeid)) {
-        $url = $CFG->wwwroot.'/grade/edit/tree/item.php?id='.$id.'&amp;courseid='.$courseid;
+        $url = new moodle_url('/grade/edit/tree/item.php', ['id' => $id, 'courseid' => $courseid]);
         redirect($gpr->add_url_params($url));
     }
     $item = $grade_item->get_record_data();
diff --git a/grade/lib.php b/grade/lib.php
index 2d337b7ecea..273ccb31b59 100644
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -1222,10 +1222,9 @@ class grade_plugin_return {
      * Add return tracking params into url
      *
      * @param moodle_url $url A URL
-     *
-     * @return string $url with return tracking params
+     * @return moodle_url with return tracking params
      */
-    public function add_url_params(moodle_url $url) {
+    public function add_url_params(moodle_url $url): moodle_url {
         if (empty($this->type)) {
             return $url;
         }