MDL-49682 mod_forum: Correct arguments to format_message_text

This feeds straight into context_module::instance() and I was inadvertantly
using the forum->id, rather than the cm->id.

diff --git a/mod/forum/classes/output/email/renderer.php b/mod/forum/classes/output/email/renderer.php
index a37b721..62c83df 100644 (file)
--- a/mod/forum/classes/output/email/renderer.php
+++ b/mod/forum/classes/output/email/renderer.php
@@ -48,11 +48,11 @@ class renderer extends \mod_forum_renderer {
     /**
      * The HTML version of the e-mail message.
      *
-     * @param \stdClass $forum
+     * @param \stdClass $cm
      * @param \stdClass $post
      * @return string
      */
-    public function format_message_text($forum, $post) {
+    public function format_message_text($cm, $post) {
         $options = new \stdClass();
         $options->para = true;
         return format_text($post->message, $post->messageformat, $options);

diff --git a/mod/forum/classes/output/email/renderer_textemail.php b/mod/forum/classes/output/email/renderer_textemail.php
index 82e99b8..ffa854f 100644 (file)
--- a/mod/forum/classes/output/email/renderer_textemail.php
+++ b/mod/forum/classes/output/email/renderer_textemail.php
@@ -48,13 +48,13 @@ class renderer_textemail extends renderer {
     /**
      * The plaintext version of the e-mail message.
      *
-     * @param \stdClass $forum
+     * @param \stdClass $cm
      * @param \stdClass $post
      * @return string
      */
-    public function format_message_text($forum, $post) {
+    public function format_message_text($cm, $post) {
         $message = file_rewrite_pluginfile_urls($post->message, 'pluginfile.php',
-            \context_module::instance($forum->id)->id,
+            \context_module::instance($cm->id)->id,
             'mod_forum', 'post', $post->id);
         return format_text_email($message, $post->messageformat);
     }

diff --git a/mod/forum/classes/output/emaildigestbasic/renderer_textemail.php b/mod/forum/classes/output/emaildigestbasic/renderer_textemail.php
index dc1e0ed..1756031 100644 (file)
--- a/mod/forum/classes/output/emaildigestbasic/renderer_textemail.php
+++ b/mod/forum/classes/output/emaildigestbasic/renderer_textemail.php
@@ -48,13 +48,13 @@ class renderer_textemail extends \mod_forum\output\email\renderer_textemail {
     /**
      * The plaintext version of the e-mail message.
      *
-     * @param \stdClass $forum
+     * @param \stdClass $cm
      * @param \stdClass $post
      * @return string
      */
-    public function format_message_text($forum, $post) {
+    public function format_message_text($cm, $post) {
         $message = file_rewrite_pluginfile_urls($post->message, 'pluginfile.php',
-            \context_module::instance($forum->id)->id,
+            \context_module::instance($cm->id)->id,
             'mod_forum', 'post', $post->id);
         return format_text_email($message, $post->messageformat);
     }

diff --git a/mod/forum/classes/output/emaildigestfull/renderer_textemail.php b/mod/forum/classes/output/emaildigestfull/renderer_textemail.php
index 99f70a8..119c4dc 100644 (file)
--- a/mod/forum/classes/output/emaildigestfull/renderer_textemail.php
+++ b/mod/forum/classes/output/emaildigestfull/renderer_textemail.php
@@ -48,13 +48,13 @@ class renderer_textemail extends \mod_forum\output\email\renderer_textemail {
     /**
      * The plaintext version of the e-mail message.
      *
-     * @param \stdClass $forum
+     * @param \stdClass $cm
      * @param \stdClass $post
      * @return string
      */
-    public function format_message_text($forum, $post) {
+    public function format_message_text($cm, $post) {
         $message = file_rewrite_pluginfile_urls($post->message, 'pluginfile.php',
-            \context_module::instance($forum->id)->id,
+            \context_module::instance($cm->id)->id,
             'mod_forum', 'post', $post->id);
         return format_text_email($message, $post->messageformat);
     }

diff --git a/mod/forum/classes/output/forum_post.php b/mod/forum/classes/output/forum_post.php
index c68d76c..b91382e 100644 (file)
--- a/mod/forum/classes/output/forum_post.php
+++ b/mod/forum/classes/output/forum_post.php
@@ -149,7 +149,7 @@ class forum_post implements \renderable {
             'postdate'                      => $this->get_postdate(),
 
             // Format some components according to the renderer.
-            'message'                       => $renderer->format_message_text($this->forum, $this->post),
+            'message'                       => $renderer->format_message_text($this->cm, $this->post),
             'attachments'                   => $renderer->format_message_attachments($this->cm, $this->post),
 
             'canreply'                      => $this->canreply,