From 0d23988cfca96c344feb81915630be2f00cba584 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Wed, 17 Apr 2024 12:05:04 +0100 Subject: [PATCH] MDL-81577 mod: correct arguments when formatting text for RSS. --- mod/forum/rsslib.php | 10 ++++------ mod/glossary/rsslib.php | 8 ++++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/mod/forum/rsslib.php b/mod/forum/rsslib.php index 5886eab5911..58258b27d69 100644 --- a/mod/forum/rsslib.php +++ b/mod/forum/rsslib.php @@ -314,8 +314,6 @@ function forum_rss_get_group_sql($cm, $groupmode, $currentgroup, $modcontext=nul function forum_rss_feed_contents($forum, $sql, $params, $context) { global $CFG, $DB, $USER; - $status = true; - $recs = $DB->get_recordset_sql($sql, $params, 0, $forum->rssarticles); //set a flag. Are we displaying discussions or posts? @@ -328,7 +326,6 @@ function forum_rss_feed_contents($forum, $sql, $params, $context) { throw new \moodle_exception('invalidcoursemodule'); } - $formatoptions = new stdClass(); $items = array(); foreach ($recs as $rec) { $item = new stdClass(); @@ -377,7 +374,6 @@ function forum_rss_feed_contents($forum, $sql, $params, $context) { $item->author = fullname($rec); $message = file_rewrite_pluginfile_urls($rec->postmessage, 'pluginfile.php', $context->id, 'mod_forum', 'post', $rec->postid); - $formatoptions->trusted = $rec->posttrust; } if ($isdiscussion) { @@ -386,8 +382,10 @@ function forum_rss_feed_contents($forum, $sql, $params, $context) { $item->link = $CFG->wwwroot."/mod/forum/discuss.php?d=".$rec->discussionid."&parent=".$rec->postid; } - $formatoptions->trusted = $rec->posttrust; - $item->description = format_text($message, $rec->postformat, $formatoptions, $forum->course); + $item->description = format_text($message, $rec->postformat, [ + 'context' => $context, + 'trusted' => $rec->posttrust, + ]); //TODO: MDL-31129 implement post attachment handling /*if (!$isdiscussion) { diff --git a/mod/glossary/rsslib.php b/mod/glossary/rsslib.php index eaeec384590..fd4f577d678 100644 --- a/mod/glossary/rsslib.php +++ b/mod/glossary/rsslib.php @@ -81,9 +81,6 @@ $items = array(); - $formatoptions = new stdClass(); - $formatoptions->trusttext = true; - foreach ($recs as $rec) { $item = new stdClass(); $item->title = $rec->entryconcept; @@ -97,7 +94,10 @@ $definition = file_rewrite_pluginfile_urls($rec->entrydefinition, 'pluginfile.php', $modcontext->id, 'mod_glossary', 'entry', $rec->entryid); - $item->description = format_text($definition, $rec->entryformat, $formatoptions, $glossary->course); + $item->description = format_text($definition, $rec->entryformat, [ + 'context' => $modcontext, + 'trusted' => true, + ]); $items[] = $item; }