From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Sun, 19 Aug 2012 06:58:23 +0000 (+0200)
Subject: Follow-up I774a89d6 (2fabea7): use $this->msg() in HistoryAction
X-Git-Tag: 1.31.0-rc.0~22679^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=701ade0a495d9810228fb6949d3201c382be2e8a;p=lhc%2Fweb%2Fwiklou.git

Follow-up I774a89d6 (2fabea7): use $this->msg() in HistoryAction

Change-Id: I308cc8b2e78eab1f2a14b5ade3867216ea3c2525
---

diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index c22c04bab7..1c57f2505a 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -248,8 +248,8 @@ class HistoryAction extends FormlessAction {
 
 		$feed = new $wgFeedClasses[$type](
 			$this->getTitle()->getPrefixedText() . ' - ' .
-			wfMessage( 'history-feed-title' )->inContentLanguage()->text(),
-			wfMessage( 'history-feed-description' )->inContentLanguage()->text(),
+			$this->msg( 'history-feed-title' )->inContentLanguage()->text(),
+			$this->msg( 'history-feed-description' )->inContentLanguage()->text(),
 			$this->getTitle()->getFullUrl( 'action=history' )
 		);
 
@@ -275,8 +275,8 @@ class HistoryAction extends FormlessAction {
 
 	function feedEmpty() {
 		return new FeedItem(
-			wfMessage( 'nohistory' )->inContentLanguage()->text(),
-			$this->getOutput()->parse( wfMessage( 'history-feed-empty' )->inContentLanguage()->text() ),
+			$this->msg( 'nohistory' )->inContentLanguage()->text(),
+			$this->msg( 'history-feed-empty' )->inContentLanguage()->parseAsBlock(),
 			$this->getTitle()->getFullUrl(),
 			wfTimestamp( TS_MW ),
 			'',
@@ -304,14 +304,14 @@ class HistoryAction extends FormlessAction {
 		);
 		if ( $rev->getComment() == '' ) {
 			global $wgContLang;
-			$title = wfMessage( 'history-feed-item-nocomment',
+			$title = $this->msg( 'history-feed-item-nocomment',
 				$rev->getUserText(),
 				$wgContLang->timeanddate( $rev->getTimestamp() ),
 				$wgContLang->date( $rev->getTimestamp() ),
 				$wgContLang->time( $rev->getTimestamp() ) )->inContentLanguage()->text();
 		} else {
 			$title = $rev->getUserText() .
-			wfMessage( 'colon-separator' )->inContentLanguage()->text() .
+			$this->msg( 'colon-separator' )->inContentLanguage()->text() .
 			FeedItem::stripComment( $rev->getComment() );
 		}
 		return new FeedItem(