From f8b922413af69866625d6d50db3ac492920d2899 Mon Sep 17 00:00:00 2001 From: skodak Date: Sat, 21 Oct 2006 21:15:26 +0000 Subject: [PATCH] Seeing ####TRUSTTEXT#### in RSS feeds MDL-7147 - fixed RSS feeds in glossary; merged from MOODLE_17_STABLE --- mod/glossary/rsslib.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mod/glossary/rsslib.php b/mod/glossary/rsslib.php index 4143db6e598..89170f7c592 100644 --- a/mod/glossary/rsslib.php +++ b/mod/glossary/rsslib.php @@ -170,6 +170,10 @@ $articlesleft = $glossary->rssarticles; $item = NULL; $user = NULL; + + $formatoptions = new object; + $formatoptions->trusttext = true; + foreach ($recs as $rec) { unset($item); unset($user); @@ -179,7 +183,7 @@ $item->author = fullname($user); $item->pubdate = $rec->entrytimecreated; $item->link = $CFG->wwwroot."/mod/glossary/showentry.php?courseid=".$glossary->course."&eid=".$rec->entryid; - $item->description = format_text($rec->entrydefinition,$rec->entryformat,NULL,$glossary->course); + $item->description = format_text($rec->entrydefinition,$rec->entryformat,$formatoptions,$glossary->course); $items[] = $item; $articlesleft--; if ($articlesleft < 1) { @@ -228,6 +232,10 @@ $articlesleft = $glossary->rssarticles; $item = NULL; $user = NULL; + + $formatoptions = new object; + $formatoptions->trusttext = true; + foreach ($recs as $rec) { unset($item); unset($user); @@ -237,7 +245,7 @@ //$item->author = fullname($user); $item->pubdate = $rec->entrytimecreated; $item->link = $CFG->wwwroot."/mod/glossary/showentry.php?courseid=".$glossary->course."&eid=".$rec->entryid; - $item->description = format_text($rec->entrydefinition,$rec->entryformat,NULL,$glossary->course); + $item->description = format_text($rec->entrydefinition,$rec->entryformat,$formatoptions,$glossary->course); $items[] = $item; $articlesleft--; if ($articlesleft < 1) {