Merged fix for trusttext from stable

diff --git a/blocks/glossary_random/block_glossary_random.php b/blocks/glossary_random/block_glossary_random.php
index 893d692b77c717d6e8a7712153b53b141ed2e8b0..315e83014b1e35dd7c9ebcea2c8d8ccc816b6a08 100644 (file)
--- a/blocks/glossary_random/block_glossary_random.php
+++ b/blocks/glossary_random/block_glossary_random.php
@@ -85,7 +85,10 @@ class block_glossary_random extends block_base {
                 } else {
                     $text = "<h2>".format_string($entry->concept,true)."</h2>";
                 }  
-                $text .= format_text($entry->definition, $entry->format);
+
+                $options = new object;
+                $options->trusttext = true;
+                $text .= format_text($entry->definition, $entry->format, $options);
 
                 $this->config->nexttime = usergetmidnight(time()) + DAYSECS * $this->config->refresh;
                 $this->config->previous = $i;