(bug 35893) Special:Block should load mediawiki.special.block.js

Special:Block is showing checkboxes that apply only to IP blocks when
blocking usernames, and vice versa. The code to hide these checkboxes
already exists in resources/mediawiki.special/mediawiki.special.block.js,
but it's not being loaded.

Change-Id: I875125b56e9f234dbff87bff3b045877fb1614be

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index 24d6b19..d09b7de 100644 (file)
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -169,6 +169,7 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki.
   values are used instead of just the fixed values from when the tablesorter
   was initialized.
 * (bug 38093) Gender of changed user groups missing in Special:Log/rights
+* (bug 35893) Special:Block needs to load mediawiki.special.block.js.
 
 === API changes in 1.20 ===
 * (bug 34316) Add ability to retrieve maximum upload size from MediaWiki API.

diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php
index 3c43ed1..cd467a8 100644 (file)
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -300,6 +300,8 @@ class SpecialBlock extends FormSpecialPage {
         * @return String
         */
        protected function preText(){
+               $this->getOutput()->addModules( 'mediawiki.special.block' );
+
                $text = $this->msg( 'blockiptext' )->parse();
 
                $otherBlockMessages = array();