1 files changed, 14 insertions, 15 deletions

diff --git a/includes/specials/SpecialBrokenRedirects.php b/includes/specials/SpecialBrokenRedirects.php
index 2330c896..b8dbe9e8 100644
--- a/includes/specials/SpecialBrokenRedirects.php
+++ b/includes/specials/SpecialBrokenRedirects.php
@@ -22,7 +22,7 @@
  */
 
 /**
- * A special page listing redirects tonon existent page. Those should be
+ * A special page listing redirects to non existent page. Those should be
  * fixed to point to an existing page.
  *
  * @ingroup SpecialPage
@@ -38,7 +38,7 @@ class BrokenRedirectsPage extends PageQueryPage {
 	function sortDescending() { return false; }
 
 	function getPageHeader() {
-		return wfMsgExt( 'brokenredirectstext', array( 'parse' ) );
+		return $this->msg( 'brokenredirectstext' )->parseAsBlock();
 	}
 
 	function getQueryInfo() {
@@ -47,6 +47,7 @@ class BrokenRedirectsPage extends PageQueryPage {
 					'p2' => 'page' ),
 			'fields' => array( 'p1.page_namespace AS namespace',
 					'p1.page_title AS title',
+					'p1.page_title AS value',
 					'rd_namespace',
 					'rd_title'
 			),
@@ -77,8 +78,6 @@ class BrokenRedirectsPage extends PageQueryPage {
 	 * @return String
 	 */
 	function formatResult( $skin, $result ) {
-		global $wgUser, $wgLang;
-
 		$fromObj = Title::makeTitle( $result->namespace, $result->title );
 		if ( isset( $result->rd_title ) ) {
 			$toObj = Title::makeTitle( $result->rd_namespace, $result->rd_title );
@@ -93,43 +92,43 @@ class BrokenRedirectsPage extends PageQueryPage {
 
 		// $toObj may very easily be false if the $result list is cached
 		if ( !is_object( $toObj ) ) {
-			return '<del>' . $skin->link( $fromObj ) . '</del>';
+			return '<del>' . Linker::link( $fromObj ) . '</del>';
 		}
 
-		$from = $skin->linkKnown(
+		$from = Linker::linkKnown(
 			$fromObj,
 			null,
 			array(),
 			array( 'redirect' => 'no' )
 		);
 		$links = array();
-		$links[] = $skin->linkKnown(
+		$links[] = Linker::linkKnown(
 			$fromObj,
-			wfMsgHtml( 'brokenredirects-edit' ),
+			$this->msg( 'brokenredirects-edit' )->escaped(),
 			array(),
 			array( 'action' => 'edit' )
 		);
-		$to = $skin->link(
+		$to = Linker::link(
 			$toObj,
 			null,
 			array(),
 			array(),
 			array( 'broken' )
 		);
-		$arr = $wgLang->getArrow();
+		$arr = $this->getLanguage()->getArrow();
 
-		$out = $from . wfMsg( 'word-separator' );
+		$out = $from . $this->msg( 'word-separator' )->escaped();
 
-		if( $wgUser->isAllowed( 'delete' ) ) {
-			$links[] = $skin->linkKnown(
+		if( $this->getUser()->isAllowed( 'delete' ) ) {
+			$links[] = Linker::linkKnown(
 				$fromObj,
-				wfMsgHtml( 'brokenredirects-delete' ),
+				$this->msg( 'brokenredirects-delete' )->escaped(),
 				array(),
 				array( 'action' => 'delete' )
 			);
 		}
 
-		$out .= wfMsg( 'parentheses', $wgLang->pipeList( $links ) );
+		$out .= $this->msg( 'parentheses' )->rawParams( $this->getLanguage()->pipeList( $links ) )->escaped();
 		$out .= " {$arr} {$to}";
 		return $out;
 	}