merging latest master

[lhc/web/wiklou.git] / includes / specials / SpecialBrokenRedirects.php

diff --git a/includes/specials/SpecialBrokenRedirects.php b/includes/specials/SpecialBrokenRedirects.php
index 61f7e7a..8119e6d 100644 (file)
--- a/includes/specials/SpecialBrokenRedirects.php
+++ b/includes/specials/SpecialBrokenRedirects.php
@@ -27,7 +27,7 @@
  *
  * @ingroup SpecialPage
  */
-class BrokenRedirectsPage extends PageQueryPage {
+class BrokenRedirectsPage extends QueryPage {
 
        function __construct( $name = 'BrokenRedirects' ) {
                parent::__construct( $name );
@@ -38,22 +38,23 @@ class BrokenRedirectsPage extends PageQueryPage {
        function sortDescending() { return false; }
 
        function getPageHeader() {
-               return wfMsgExt( 'brokenredirectstext', array( 'parse' ) );
+               return $this->msg( 'brokenredirectstext' )->parseAsBlock();
        }
 
        function getQueryInfo() {
                return array(
                        'tables' => array( 'redirect', 'p1' => 'page',
                                        'p2' => 'page' ),
-                       'fields' => array( 'p1.page_namespace AS namespace',
-                                       'p1.page_title AS title',
+                       'fields' => array( 'namespace' => 'p1.page_namespace',
+                                       'title' => 'p1.page_title',
+                                       'value' => 'p1.page_title',
                                        'rd_namespace',
                                        'rd_title'
                        ),
                        'conds' => array( 'rd_namespace >= 0',
                                        'p2.page_namespace IS NULL'
                        ),
-                       'join_conds' => array( 'p1' => array( 'LEFT JOIN', array(
+                       'join_conds' => array( 'p1' => array( 'JOIN', array(
                                                'rd_from=p1.page_id',
                                        ) ),
                                        'p2' => array( 'LEFT JOIN', array(
@@ -103,7 +104,7 @@ class BrokenRedirectsPage extends PageQueryPage {
                $links = array();
                $links[] = Linker::linkKnown(
                        $fromObj,
-                       wfMsgHtml( 'brokenredirects-edit' ),
+                       $this->msg( 'brokenredirects-edit' )->escaped(),
                        array(),
                        array( 'action' => 'edit' )
                );
@@ -114,20 +115,20 @@ class BrokenRedirectsPage extends PageQueryPage {
                        array(),
                        array( 'broken' )
                );
-               $arr = $this->getLang()->getArrow();
+               $arr = $this->getLanguage()->getArrow();
 
-               $out = $from . wfMsg( 'word-separator' );
+               $out = $from . $this->msg( 'word-separator' )->escaped();
 
                if( $this->getUser()->isAllowed( 'delete' ) ) {
                        $links[] = Linker::linkKnown(
                                $fromObj,
-                               wfMsgHtml( 'brokenredirects-delete' ),
+                               $this->msg( 'brokenredirects-delete' )->escaped(),
                                array(),
                                array( 'action' => 'delete' )
                        );
                }
 
-               $out .= wfMsg( 'parentheses', $this->getLang()->pipeList( $links ) );
+               $out .= $this->msg( 'parentheses' )->rawParams( $this->getLanguage()->pipeList( $links ) )->escaped();
                $out .= " {$arr} {$to}";
                return $out;
        }