use Message::content() to get message content

diff --git a/includes/Message.php b/includes/Message.php
index b908981..86d3609 100644 (file)
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -400,6 +400,10 @@ class Message {
                return $this;
        }
 
+       /**
+        * Returns the message as a Content object.
+        * @return Content
+        */
        public function content() {
                if ( !$this->content ) {
                        $this->content = new MessageContent( $this->key );
@@ -408,7 +412,7 @@ class Message {
                return $this->content;
        }
 
-               /**
+       /**
         * Returns the message parsed from wikitext to HTML.
         * @return String: HTML
         */

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index e7553a2..9527176 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3567,8 +3567,8 @@ class Parser {
                                        $text = false;
                                        break;
                                }
+                               $content = $message->content();
                                $text = $message->plain();
-                               $content = ContentHandler::makeContent( $text, $title ); #TODO: use Message::content() instead, once that exists
                        } else {
                                break;
                        }