Merge "auth: Follow up on e907d4328dc3e"

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

diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index b8dfc04..8051b0b 100644 (file)
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -76,19 +76,19 @@ class SpecialNewpages extends IncludableSpecialPage {
        protected function parseParams( $par ) {
                $bits = preg_split( '/\s*,\s*/', trim( $par ) );
                foreach ( $bits as $bit ) {
-                       if ( 'shownav' == $bit ) {
+                       if ( $bit === 'shownav' ) {
                                $this->showNavigation = true;
                        }
-                       if ( 'hideliu' === $bit ) {
+                       if ( $bit === 'hideliu' ) {
                                $this->opts->setValue( 'hideliu', true );
                        }
-                       if ( 'hidepatrolled' == $bit ) {
+                       if ( $bit === 'hidepatrolled' ) {
                                $this->opts->setValue( 'hidepatrolled', true );
                        }
-                       if ( 'hidebots' == $bit ) {
+                       if ( $bit === 'hidebots' ) {
                                $this->opts->setValue( 'hidebots', true );
                        }
-                       if ( 'showredirs' == $bit ) {
+                       if ( $bit === 'showredirs' ) {
                                $this->opts->setValue( 'hideredirs', false );
                        }
                        if ( is_numeric( $bit ) ) {
@@ -229,13 +229,6 @@ class SpecialNewpages extends IncludableSpecialPage {
                $ut = Title::makeTitleSafe( NS_USER, $username );
                $userText = $ut ? $ut->getText() : '';
 
-               // Store query values in hidden fields so that form submission doesn't lose them
-               $hidden = [];
-               foreach ( $this->opts->getUnconsumedValues() as $key => $value ) {
-                       $hidden[] = Html::hidden( $key, $value );
-               }
-               $hidden = implode( "\n", $hidden );
-
                $formDescriptor = [
                        'namespace' => [
                                'type' => 'namespaceselect',
@@ -272,6 +265,12 @@ class SpecialNewpages extends IncludableSpecialPage {
                ];
 
                $htmlForm = HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext() );
+
+               // Store query values in hidden fields so that form submission doesn't lose them
+               foreach ( $this->opts->getUnconsumedValues() as $key => $value ) {
+                       $htmlForm->addHiddenField( $key, $value );
+               }
+
                $htmlForm
                        ->setMethod( 'get' )
                        ->setFormIdentifier( 'newpagesform' )
@@ -288,7 +287,7 @@ class SpecialNewpages extends IncludableSpecialPage {
                                'div',
                                null,
                                $this->filterLinks()
-                       ) . $hidden )
+                       ) )
                        ->show();
                $out->addModuleStyles( 'mediawiki.special' );
        }