From: daniel <daniel.kinzler@wikimedia.de>
Date: Tue, 12 Jun 2012 09:12:49 +0000 (+0200)
Subject: use Message::content() to get message content
X-Git-Tag: 1.31.0-rc.0~22097^2^2~107
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=2eb4b6e2b3b98b372503057d78cb91ad14e3a9eb;p=lhc%2Fweb%2Fwiklou.git

use Message::content() to get message content
---

diff --git a/includes/Message.php b/includes/Message.php
index b9089814ab..86d36096b4 100644
--- 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 e7553a2948..9527176273 100644
--- 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;
 			}