From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Wed, 28 Mar 2012 10:34:34 +0000 (+0200)
Subject: Use local context to get messages
X-Git-Tag: 1.31.0-rc.0~24105^2
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=95c35e52113b9a98accc1e9b0e9fffc15b1661a8;p=lhc%2Fweb%2Fwiklou.git

Use local context to get messages

Change-Id: Ic173f92f56f74261a34c896fbd1f45ec097129d6
---

diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php
index ebb34c7833..0d9a902727 100644
--- a/includes/actions/RollbackAction.php
+++ b/includes/actions/RollbackAction.php
@@ -63,7 +63,7 @@ class RollbackAction extends FormlessAction {
 				$current = $details['current'];
 
 				if ( $current->getComment() != '' ) {
-					$this->getOutput()->addHTML( wfMessage( 'editcomment' )->rawParams(
+					$this->getOutput()->addHTML( $this->msg( 'editcomment' )->rawParams(
 						Linker::formatComment( $current->getComment() ) )->parse() );
 				}
 			}
@@ -97,7 +97,7 @@ class RollbackAction extends FormlessAction {
 		$this->getOutput()->setRobotPolicy( 'noindex,nofollow' );
 
 		if ( $current->getUserText() === '' ) {
-			$old = wfMsg( 'rev-deleted-user' );
+			$old = $this->msg( 'rev-deleted-user' )->escaped();
 		} else {
 			$old = Linker::userLink( $current->getUser(), $current->getUserText() )
 				. Linker::userToolLinks( $current->getUser(), $current->getUserText() );
@@ -105,7 +105,7 @@ class RollbackAction extends FormlessAction {
 
 		$new = Linker::userLink( $target->getUser(), $target->getUserText() )
 			. Linker::userToolLinks( $target->getUser(), $target->getUserText() );
-		$this->getOutput()->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
+		$this->getOutput()->addHTML( $this->msg( 'rollback-success' )->rawParams( $old, $new )->parseAsBlock() );
 		$this->getOutput()->returnToMain( false, $this->getTitle() );
 
 		if ( !$request->getBool( 'hidediff', false ) && !$this->getUser()->getBoolOption( 'norollbackdiff', false ) ) {