Special:PrefixIndex: Fix regression on prefix input value

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

diff --git a/includes/specials/SpecialPrefixindex.php b/includes/specials/SpecialPrefixindex.php
index afd626b..b07869c 100644 (file)
--- a/includes/specials/SpecialPrefixindex.php
+++ b/includes/specials/SpecialPrefixindex.php
@@ -98,11 +98,14 @@ class SpecialPrefixindex extends SpecialAllPages {
         * @return string
         */
        protected function namespacePrefixForm( $namespace = NS_MAIN, $from = '' ) {
-               $fields = [
+               $formDescriptor = [
                        'prefix' => [
                                'label-message' => 'allpagesprefix',
+                               'name' => 'prefix',
+                               'id' => 'nsfrom',
                                'type' => 'text',
                                'size' => '30',
+                               'default' => str_replace( '_', ' ', $from ),
                        ],
                        'namespace' => [
                                'type' => 'namespaceselect',
@@ -110,24 +113,28 @@ class SpecialPrefixindex extends SpecialAllPages {
                                'id' => 'namespace',
                                'label-message' => 'namespace',
                                'all' => null,
-                               'value' => $namespace,
+                               'default' => $namespace,
                        ],
                        'hidedirects' => [
                                'class' => 'HTMLCheckField',
+                               'name' => 'hideredirects',
                                'label-message' => 'allpages-hide-redirects',
                        ],
                        'stripprefix' => [
                                'class' => 'HTMLCheckField',
+                               'name' => 'stripprefix',
                                'label-message' => 'prefixindex-strip',
                        ],
                ];
-               $form = new HTMLForm( $fields, $this->getContext() );
-               $form
+               $context = new DerivativeContext( $this->getContext() );
+               $context->setTitle( $this->getPageTitle() ); // Remove subpage
+               $htmlForm = new HTMLForm( $formDescriptor, $context );
+               $htmlForm
                        ->setMethod( 'get' )
                        ->setWrapperLegendMsg( 'allpages' )
-                       ->setSubmitTextMsg( 'prefixindex-submit' )
-                       ->prepareForm()
-                       ->displayForm( false );
+                       ->setSubmitTextMsg( 'prefixindex-submit' );
+
+               return $htmlForm->prepareForm()->getHTML( false );
        }
 
        /**