Merge branch 'MDL-55499-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 16:23:02 +0000 (18:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 16:23:02 +0000 (18:23 +0200)
mod/forum/classes/output/email/renderer.php

index 17657fd..f38b76c 100644 (file)
@@ -55,11 +55,13 @@ class renderer extends \mod_forum_renderer {
      * @return string
      */
     public function format_message_text($cm, $post) {
+        $context = \context_module::instance($cm->id);
         $message = file_rewrite_pluginfile_urls($post->message, 'pluginfile.php',
-            \context_module::instance($cm->id)->id,
+            $context->id,
             'mod_forum', 'post', $post->id);
         $options = new \stdClass();
         $options->para = true;
+        $options->context = $context;
         return format_text($message, $post->messageformat, $options);
     }