Merge "registration: Only allow one extension to set a specific config setting"

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

diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php
index cd3c028..42e7040 100644 (file)
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -99,7 +99,6 @@ class SpecialBlock extends FormSpecialPage {
         * @param HTMLForm $form
         */
        protected function alterForm( HTMLForm $form ) {
-               $form->setWrapperLegendMsg( 'blockip-legend' );
                $form->setHeaderText( '' );
                $form->setSubmitDestructive();
 
@@ -121,6 +120,10 @@ class SpecialBlock extends FormSpecialPage {
                }
        }
 
+       protected function getDisplayFormat() {
+               return 'ooui';
+       }
+
        /**
         * Get the HTMLForm descriptor array for the block form
         * @return array
@@ -134,14 +137,15 @@ class SpecialBlock extends FormSpecialPage {
 
                $a = [
                        'Target' => [
-                               'type' => 'text',
+                               'type' => 'user',
+                               'ipallowed' => true,
+                               'iprange' => true,
                                'label-message' => 'ipaddressorusername',
                                'id' => 'mw-bi-target',
                                'size' => '45',
                                'autofocus' => true,
                                'required' => true,
                                'validation-callback' => [ __CLASS__, 'validateTargetField' ],
-                               'cssclass' => 'mw-autocomplete-user', // used by mediawiki.userSuggest
                        ],
                        'Expiry' => [
                                'type' => !count( $suggestedDurations ) ? 'text' : 'selectorother',
@@ -220,6 +224,7 @@ class SpecialBlock extends FormSpecialPage {
                        'type' => 'hidden',
                        'default' => '',
                        'label-message' => 'ipb-confirm',
+                       'cssclass' => 'mw-block-confirm',
                ];
 
                $this->maybeAlterFormDefaults( $a );
@@ -323,7 +328,7 @@ class SpecialBlock extends FormSpecialPage {
         * @return string
         */
        protected function preText() {
-               $this->getOutput()->addModules( [ 'mediawiki.special.block', 'mediawiki.userSuggest' ] );
+               $this->getOutput()->addModules( [ 'mediawiki.special.block' ] );
 
                $blockCIDRLimit = $this->getConfig()->get( 'BlockCIDRLimit' );
                $text = $this->msg( 'blockiptext', $blockCIDRLimit['IPv4'], $blockCIDRLimit['IPv6'] )->parse();