Merge "Simplify checking for widgets on special block page"

diff --combined includes/specials/SpecialBlock.php
index 155d6a4,f0f6a12..9e218b6
--- 1/includes/specials/SpecialBlock.php
--- 2/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@@ -141,7 -141,9 +141,9 @@@ class SpecialBlock extends FormSpecialP
         * @return array
         */
        protected function getFormFields() {
-               global $wgBlockAllowsUTEdit;
+               $conf = $this->getConfig();
+               $enablePartialBlocks = $conf->get( 'EnablePartialBlocks' );
+               $blockAllowsUTEdit = $conf->get( 'BlockAllowsUTEdit' );
  
                $this->getOutput()->enableOOUI();
  
@@@ -149,9 -151,6 +151,6 @@@
  
                $suggestedDurations = self::getSuggestedDurations();
  
-               $conf = $this->getConfig();
-               $enablePartialBlocks = $conf->get( 'EnablePartialBlocks' );
- 
                $a = [];
  
                $a['Target'] = [
@@@ -232,7 -231,7 +231,7 @@@
                        ];
                }
  
-               if ( $wgBlockAllowsUTEdit ) {
+               if ( $blockAllowsUTEdit ) {
                        $a['DisableUTEdit'] = [
                                'type' => 'check',
                                'label-message' => 'ipb-disableusertalk',
@@@ -620,7 -619,6 +619,7 @@@
         *     the HTMLForm
         * @param WebRequest|null $request Optionally try and get data from a request too
         * @return array [ User|string|null, Block::TYPE_ constant|null ]
 +       * @phan-return array{0:User|string|null,1:int|null}
         */
        public static function getTargetAndType( $par, WebRequest $request = null ) {
                $i = 0;

diff --combined resources/Resources.php
index ba61488,fedf429..174c7d9
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -27,6 -27,12 +27,6 @@@ if ( !defined( 'MEDIAWIKI' ) ) 
  global $wgResourceBasePath;
  
  return [
 -
 -      /**
 -       * Special modules who have their own classes
 -       */
 -      'startup' => [ 'class' => ResourceLoaderStartUpModule::class ],
 -
        // Scripts managed by the local wiki (stored in the MediaWiki namespace)
        'site' => [ 'class' => ResourceLoaderSiteModule::class ],
        'site.styles' => [ 'class' => ResourceLoaderSiteStylesModule::class ],
@@@ -1435,13 -1441,12 +1435,13 @@@
                ],
        ],
        'mediawiki.action.history' => [
 +              'dependencies' => [ 'jquery.makeCollapsible' ],
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.history.js',
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.css',
        ],
        'mediawiki.action.history.styles' => [
                'skinStyles' => [
 -                      'default' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
 +                      'default' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.less',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@@ -2100,7 -2105,15 +2100,15 @@@
                ],
        ],
        'mediawiki.special.block' => [
-               'scripts' => 'resources/src/mediawiki.special.block.js',
+               'localBasePath' => "$IP/resources/src",
+               'remoteBasePath' => "$wgResourceBasePath/resources/src",
+               'packageFiles' => [
+                       'mediawiki.special.block.js',
+                       [ 'name' => 'config.json', 'config' => [
+                               'EnablePartialBlocks',
+                               'BlockAllowsUTEdit',
+                       ] ],
+               ],
                'dependencies' => [
                        'oojs-ui-core',
                        'oojs-ui.styles.icons-editing-core',