Merge "Disallow top level domains in Cookie::validateCookieDomain()."

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

diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index 66ec693..1ec7006 100644 (file)
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -27,15 +27,12 @@
  * @ingroup SpecialPage
  */
 class SpecialNewpages extends IncludableSpecialPage {
-       // Stored objects
-
        /**
         * @var FormOptions
         */
        protected $opts;
        protected $customFilters;
 
-       // Some internal settings
        protected $showNavigation = false;
 
        public function __construct() {
@@ -43,8 +40,6 @@ class SpecialNewpages extends IncludableSpecialPage {
        }
 
        protected function setup( $par ) {
-               global $wgEnableNewpagesUserFilter;
-
                // Options
                $opts = new FormOptions();
                $this->opts = $opts; // bind
@@ -74,9 +69,6 @@ class SpecialNewpages extends IncludableSpecialPage {
 
                // Validate
                $opts->validateIntBounds( 'limit', 0, 5000 );
-               if ( !$wgEnableNewpagesUserFilter ) {
-                       $opts->setValue( 'username', '' );
-               }
        }
 
        protected function parseParams( $par ) {
@@ -207,7 +199,7 @@ class SpecialNewpages extends IncludableSpecialPage {
        }
 
        protected function form() {
-               global $wgEnableNewpagesUserFilter, $wgScript;
+               global $wgScript;
 
                // Consume values
                $this->opts->consumeValue( 'offset' ); // don't carry offset, DWIW
@@ -268,15 +260,14 @@ class SpecialNewpages extends IncludableSpecialPage {
                                $tagFilterSelector .
                                '</td>
                        </tr>' ) : '' ) .
-                       ( $wgEnableNewpagesUserFilter ?
-                               '<tr>
+                       '<tr>
                                <td class="mw-label">' .
                                        Xml::label( $this->msg( 'newpages-username' )->text(), 'mw-np-username' ) .
                                        '</td>
                                <td class="mw-input">' .
                                        Xml::input( 'username', 30, $userText, array( 'id' => 'mw-np-username' ) ) .
                                        '</td>
-                       </tr>' : '' ) .
+                       </tr>' .
                        '<tr> <td></td>
                                <td class="mw-submit">' .
                        Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) .
@@ -394,7 +385,8 @@ class SpecialNewpages extends IncludableSpecialPage {
                        $oldTitleText = $this->msg( 'rc-old-title' )->params( $oldTitleText )->escaped();
                }
 
-               return "<li{$css}>{$time} {$dm}{$plink} {$hist} {$dm}{$length} {$dm}{$ulink} {$comment} {$tagDisplay} {$oldTitleText}</li>\n";
+               return "<li{$css}>{$time} {$dm}{$plink} {$hist} {$dm}{$length} "
+                       . "{$dm}{$ulink} {$comment} {$tagDisplay} {$oldTitleText}</li>\n";
        }
 
        /**
@@ -514,7 +506,6 @@ class NewPagesPager extends ReverseChronologicalPager {
        }
 
        function getQueryInfo() {
-               global $wgEnableNewpagesUserFilter;
                $conds = array();
                $conds['rc_new'] = 1;
 
@@ -534,8 +525,7 @@ class NewPagesPager extends ReverseChronologicalPager {
                        }
                }
 
-               # $wgEnableNewpagesUserFilter - temp WMF hack
-               if ( $wgEnableNewpagesUserFilter && $user ) {
+               if ( $user ) {
                        $conds['rc_user_text'] = $user->getText();
                        $rcIndexes = 'rc_user_text';
                } elseif ( User::groupHasPermission( '*', 'createpage' ) &&