Merge "registration: Don't let extensions load late"

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

diff --git a/includes/specials/SpecialDoubleRedirects.php b/includes/specials/SpecialDoubleRedirects.php
index c04582e..9140bf1 100644 (file)
--- a/includes/specials/SpecialDoubleRedirects.php
+++ b/includes/specials/SpecialDoubleRedirects.php
@@ -50,15 +50,15 @@ class DoubleRedirectsPage extends QueryPage {
 
        function reallyGetQueryInfo( $namespace = null, $title = null ) {
                $limitToTitle = !( $namespace === null && $title === null );
-               $dbr = wfGetDB( DB_SLAVE );
-               $retval = array(
-                       'tables' => array(
+               $dbr = wfGetDB( DB_REPLICA );
+               $retval = [
+                       'tables' => [
                                'ra' => 'redirect',
                                'rb' => 'redirect',
                                'pa' => 'page',
                                'pb' => 'page'
-                       ),
-                       'fields' => array(
+                       ],
+                       'fields' => [
                                'namespace' => 'pa.page_namespace',
                                'title' => 'pa.page_title',
                                'value' => 'pa.page_title',
@@ -71,8 +71,8 @@ class DoubleRedirectsPage extends QueryPage {
                                'nsc' => 'rb.rd_namespace',
                                'tc' => 'rb.rd_title',
                                'iwc' => 'rb.rd_interwiki',
-                       ),
-                       'conds' => array(
+                       ],
+                       'conds' => [
                                'ra.rd_from = pa.page_id',
 
                                // Filter out redirects where the target goes interwiki (bug 40353).
@@ -88,8 +88,8 @@ class DoubleRedirectsPage extends QueryPage {
                                'pb.page_title = ra.rd_title',
 
                                'rb.rd_from = pb.page_id',
-                       )
-               );
+                       ]
+               ];
 
                if ( $limitToTitle ) {
                        $retval['conds']['pa.page_namespace'] = $namespace;
@@ -104,7 +104,7 @@ class DoubleRedirectsPage extends QueryPage {
        }
 
        function getOrderFields() {
-               return array( 'ra.rd_namespace', 'ra.rd_title' );
+               return [ 'ra.rd_namespace', 'ra.rd_title' ];
        }
 
        /**
@@ -121,7 +121,7 @@ class DoubleRedirectsPage extends QueryPage {
                // get a little more detail about each individual entry quickly
                // using the filter of reallyGetQueryInfo.
                if ( $result && !isset( $result->nsb ) ) {
-                       $dbr = wfGetDB( DB_SLAVE );
+                       $dbr = wfGetDB( DB_REPLICA );
                        $qi = $this->reallyGetQueryInfo(
                                $result->namespace,
                                $result->title
@@ -137,18 +137,19 @@ class DoubleRedirectsPage extends QueryPage {
                                $result = $dbr->fetchObject( $res );
                        }
                }
+               $linkRenderer = $this->getLinkRenderer();
                if ( !$result ) {
-                       return '<del>' . Linker::link( $titleA, null, array(), array( 'redirect' => 'no' ) ) . '</del>';
+                       return '<del>' . $linkRenderer->makeLink( $titleA, null, [], [ 'redirect' => 'no' ] ) . '</del>';
                }
 
                $titleB = Title::makeTitle( $result->nsb, $result->tb );
                $titleC = Title::makeTitle( $result->nsc, $result->tc, '', $result->iwc );
 
-               $linkA = Linker::linkKnown(
+               $linkA = $linkRenderer->makeKnownLink(
                        $titleA,
                        null,
-                       array(),
-                       array( 'redirect' => 'no' )
+                       [],
+                       [ 'redirect' => 'no' ]
                );
 
                // if the page is editable, add an edit link
@@ -158,26 +159,24 @@ class DoubleRedirectsPage extends QueryPage {
                        // check, if the content model is editable through action=edit
                        ContentHandler::getForTitle( $titleA )->supportsDirectEditing()
                ) {
-                       $edit = Linker::linkKnown(
+                       $edit = $linkRenderer->makeKnownLink(
                                $titleA,
-                               $this->msg( 'parentheses', $this->msg( 'editlink' )->text() )->escaped(),
-                               array(),
-                               array(
-                                       'action' => 'edit'
-                               )
+                               $this->msg( 'parentheses', $this->msg( 'editlink' )->text() )->text(),
+                               [],
+                               [ 'action' => 'edit' ]
                        );
                } else {
                        $edit = '';
                }
 
-               $linkB = Linker::linkKnown(
+               $linkB = $linkRenderer->makeKnownLink(
                        $titleB,
                        null,
-                       array(),
-                       array( 'redirect' => 'no' )
+                       [],
+                       [ 'redirect' => 'no' ]
                );
 
-               $linkC = Linker::linkKnown( $titleC );
+               $linkC = $linkRenderer->makeKnownLink( $titleC );
 
                $lang = $this->getLanguage();
                $arr = $lang->getArrow() . $lang->getDirMark();