mirror of
https://github.com/moodle/moodle.git
synced 2025-05-04 15:27:34 +02:00
Seeing ####TRUSTTEXT#### in RSS feeds MDL-7147 - fixed RSS feeds in glossary; merged from MOODLE_17_STABLE
This commit is contained in:
parent
ec41cb3c52
commit
f8b922413a
@ -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) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user