Seeing ####TRUSTTEXT#### in RSS feeds MDL-7147 - fixed RSS feeds in glossary; merged...

diff --git a/mod/glossary/rsslib.php b/mod/glossary/rsslib.php
index 4143db6e598a82f371cd36d09a7aeaa50e3851e9..89170f7c592ed953737f88def2fe19466dabd7a0 100644 (file)
--- 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) {