Merge "Fix indenting and newlines"

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

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 983f74c..60e797e 100644 (file)
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -225,20 +225,6 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
                }
        }
 
-       /**
-        * Get all custom filters
-        *
-        * @return array Map of filter URL param names to properties (msg/default)
-        */
-       protected function getCustomFilters() {
-               if ( $this->customFilters === null ) {
-                       $this->customFilters = parent::getCustomFilters();
-                       Hooks::run( 'SpecialRecentChangesFilters', [ $this, &$this->customFilters ], '1.23' );
-               }
-
-               return $this->customFilters;
-       }
-
        /**
         * Process $par and put options found in $opts. Used when including the page.
         *
@@ -353,17 +339,6 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
                return $rows;
        }
 
-       protected function runMainQueryHook( &$tables, &$fields, &$conds,
-               &$query_options, &$join_conds, $opts
-       ) {
-               return parent::runMainQueryHook( $tables, $fields, $conds, $query_options, $join_conds, $opts )
-                       && Hooks::run(
-                               'SpecialRecentChangesQuery',
-                               [ &$conds, &$tables, &$join_conds, $opts, &$query_options, &$fields ],
-                               '1.23'
-                       );
-       }
-
        protected function getDB() {
                return wfGetDB( DB_REPLICA, 'recentchanges' );
        }
@@ -703,7 +678,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
         */
        protected function namespaceFilterForm( FormOptions $opts ) {
                $nsSelect = Html::namespaceSelector(
-                       [ 'selected' => $opts['namespace'], 'all' => '' ],
+                       [ 'selected' => $opts['namespace'], 'all' => '', 'in-user-lang' => true ],
                        [ 'name' => 'namespace', 'id' => 'namespace' ]
                );
                $nsLabel = Xml::label( $this->msg( 'namespace' )->text(), 'namespace' );
@@ -825,7 +800,11 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
                $note = '';
                $msg = $this->msg( 'rclegend' );
                if ( !$msg->isDisabled() ) {
-                       $note .= '<div class="mw-rclegend">' . $msg->parse() . "</div>\n";
+                       $note .= Html::rawElement(
+                               'div',
+                               [ 'class' => 'mw-rclegend' ],
+                               $msg->parse()
+                       );
                }
 
                $lang = $this->getLanguage();
@@ -923,14 +902,21 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
                $datenow = $lang->userDate( $timestamp, $user );
                $pipedLinks = '<span class="rcshowhide">' . $lang->pipeList( $links ) . '</span>';
 
-               $rclinks = '<span class="rclinks">' . $this->msg( 'rclinks' )->rawParams( $cl, $dl, '' )
-                       ->parse() . '</span>';
+               $rclinks = Html::rawElement(
+                       'span',
+                       [ 'class' => 'rclinks' ],
+                       $this->msg( 'rclinks' )->rawParams( $cl, $dl, '' )->parse()
+               );
 
-               $rclistfrom = '<span class="rclistfrom">' . $this->makeOptionsLink(
-                       $this->msg( 'rclistfrom' )->rawParams( $now, $timenow, $datenow )->parse(),
-                       [ 'from' => $timestamp ],
-                       $nondefaults
-               ) . '</span>';
+               $rclistfrom = Html::rawElement(
+                       'span',
+                       [ 'class' => 'rclistfrom' ],
+                       $this->makeOptionsLink(
+                               $this->msg( 'rclistfrom' )->rawParams( $now, $timenow, $datenow )->parse(),
+                               [ 'from' => $timestamp ],
+                               $nondefaults
+                       )
+               );
 
                return "{$note}$rclinks<br />$pipedLinks<br />$rclistfrom";
        }