From d55ccfd4d2fd6bb650ba9630288a9ed1bde49c4b Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sat, 2 Jun 2012 18:32:17 +0200 Subject: [PATCH] Use local context to get messages and don't use implicit Message object to string conversion. Fix for I1d391e72 (3695486) and Idb00a337 (8a73db8) plus two changes of wfMsgHtml('diff') that were already there. Change-Id: Ie52e1060058f4d1935c991a7d0e1f651069d4ed5 --- includes/RevisionList.php | 7 ++++--- includes/revisiondelete/RevisionDelete.php | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/includes/RevisionList.php b/includes/RevisionList.php index 44c7912363..fc777b5b04 100644 --- a/includes/RevisionList.php +++ b/includes/RevisionList.php @@ -350,12 +350,12 @@ class RevisionItem extends RevisionItemBase { */ protected function getDiffLink() { if ( $this->isDeleted() && !$this->canViewContent() ) { - return wfMsgHtml('diff'); + return $this->context->msg( 'diff' )->escaped(); } else { return Linker::link( $this->list->title, - wfMsgHtml('diff'), + $this->context->msg( 'diff' )->escaped(), array(), array( 'diff' => $this->revision->getId(), @@ -371,7 +371,8 @@ class RevisionItem extends RevisionItemBase { } public function getHTML() { - $difflink = wfMessage( 'parentheses' )->rawParams( $this->getDiffLink() ); + $difflink = $this->context->msg( 'parentheses' ) + ->rawParams( $this->getDiffLink() )->escaped(); $revlink = $this->getRevisionLink(); $userlink = Linker::revUserLink( $this->revision ); $comment = Linker::revComment( $this->revision ); diff --git a/includes/revisiondelete/RevisionDelete.php b/includes/revisiondelete/RevisionDelete.php index c63fcf75ad..6d3474300b 100644 --- a/includes/revisiondelete/RevisionDelete.php +++ b/includes/revisiondelete/RevisionDelete.php @@ -260,7 +260,8 @@ class RevDel_RevisionItem extends RevDel_Item { } public function getHTML() { - $difflink = wfMessage( 'parentheses' )->rawParams( $this->getDiffLink() ); + $difflink = $this->list->msg( 'parentheses' ) + ->rawParams( $this->getDiffLink() )->escaped(); $revlink = $this->getRevisionLink(); $userlink = Linker::revUserLink( $this->revision ); $comment = Linker::revComment( $this->revision ); @@ -885,7 +886,7 @@ class RevDel_LogItem extends RevDel_Item { array(), array( 'page' => $title->getPrefixedText() ) ); - $loglink = wfMessage( 'parentheses' )->rawParams( $loglink ); + $loglink = $this->list->msg( 'parentheses' )->rawParams( $loglink )->escaped(); // User links and action text $action = $formatter->getActionText(); // Comment -- 2.20.1