From 78187606c6cf2c6423df8dc008fb36675366bf56 Mon Sep 17 00:00:00 2001
From: Andrew Gosali <andrewgosali@gmail.com>
Date: Tue, 11 Feb 2025 11:40:56 +0700
Subject: [PATCH] MDL-83856 gradingform_guide: fix remark format to always be
 FORMAT_HTML

---
 .../classes/grades/grader/gradingpanel/external/fetch.php  | 2 +-
 grade/grading/form/guide/lib.php                           | 7 +++++--
 .../classes/grades/grader/gradingpanel/external/fetch.php  | 2 +-
 grade/grading/form/rubric/lib.php                          | 7 +++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/grade/grading/form/guide/classes/grades/grader/gradingpanel/external/fetch.php b/grade/grading/form/guide/classes/grades/grader/gradingpanel/external/fetch.php
index 17d03ac35c4..35cba95e0b4 100644
--- a/grade/grading/form/guide/classes/grades/grader/gradingpanel/external/fetch.php
+++ b/grade/grading/form/guide/classes/grades/grader/gradingpanel/external/fetch.php
@@ -203,7 +203,7 @@ class fetch extends external_api {
                         $definitionid,
                         'remark',
                         $filling['remark'],
-                        (int) $filling['remarkformat']
+                        (int) FORMAT_HTML
                     );
                 }
 
diff --git a/grade/grading/form/guide/lib.php b/grade/grading/form/guide/lib.php
index e5ebb6d1aa7..c800a70879a 100644
--- a/grade/grading/form/guide/lib.php
+++ b/grade/grading/form/guide/lib.php
@@ -857,16 +857,19 @@ class gradingform_guide_instance extends gradingform_instance {
         parent::update($data);
 
         foreach ($data['criteria'] as $criterionid => $record) {
+            // Hardcoding/defaulting to html format for new/existing record
+            $record['remarkformat'] = FORMAT_HTML;
+
             if (!array_key_exists($criterionid, $currentgrade['criteria'])) {
                 $newrecord = array('instanceid' => $this->get_id(), 'criterionid' => $criterionid,
-                    'score' => $record['score'], 'remarkformat' => FORMAT_MOODLE);
+                    'score' => $record['score'], 'remarkformat' => $record['remarkformat']);
                 if (isset($record['remark'])) {
                     $newrecord['remark'] = $record['remark'];
                 }
                 $DB->insert_record('gradingform_guide_fillings', $newrecord);
             } else {
                 $newrecord = array('id' => $currentgrade['criteria'][$criterionid]['id']);
-                foreach (array('score', 'remark'/*, 'remarkformat' TODO */) as $key) {
+                foreach (array('score', 'remark', 'remarkformat') as $key) {
                     if (isset($record[$key]) && $currentgrade['criteria'][$criterionid][$key] != $record[$key]) {
                         $newrecord[$key] = $record[$key];
                     }
diff --git a/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/fetch.php b/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/fetch.php
index 9e231d9afc3..823760a0bd4 100644
--- a/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/fetch.php
+++ b/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/fetch.php
@@ -196,7 +196,7 @@ class fetch extends external_api {
                         $definitionid,
                         'remark',
                         $filling['remark'],
-                        (int) $filling['remarkformat']
+                        (int) FORMAT_HTML
                     );
                 }
 
diff --git a/grade/grading/form/rubric/lib.php b/grade/grading/form/rubric/lib.php
index b34fac44675..25d74a98a0b 100644
--- a/grade/grading/form/rubric/lib.php
+++ b/grade/grading/form/rubric/lib.php
@@ -863,16 +863,19 @@ class gradingform_rubric_instance extends gradingform_instance {
         $currentgrade = $this->get_rubric_filling();
         parent::update($data);
         foreach ($data['criteria'] as $criterionid => $record) {
+            // Hardcoding/defaulting to html format for new/existing record
+            $record['remarkformat'] = FORMAT_HTML;
+
             if (!array_key_exists($criterionid, $currentgrade['criteria'])) {
                 $newrecord = array('instanceid' => $this->get_id(), 'criterionid' => $criterionid,
-                    'levelid' => $record['levelid'], 'remarkformat' => FORMAT_MOODLE);
+                    'levelid' => $record['levelid'], 'remarkformat' => $record['remarkformat']);
                 if (isset($record['remark'])) {
                     $newrecord['remark'] = $record['remark'];
                 }
                 $DB->insert_record('gradingform_rubric_fillings', $newrecord);
             } else {
                 $newrecord = array('id' => $currentgrade['criteria'][$criterionid]['id']);
-                foreach (array('levelid', 'remark'/*, 'remarkformat' */) as $key) {
+                foreach (array('levelid', 'remark', 'remarkformat') as $key) {
                     // TODO MDL-31235 format is not supported yet
                     if (isset($record[$key]) && $currentgrade['criteria'][$criterionid][$key] != $record[$key]) {
                         $newrecord[$key] = $record[$key];