From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 24 May 2019 18:17:21 +0000 (+0000)
Subject: Merge "languages: Hard deprecate Language::getExtraUserToggles() method"
X-Git-Tag: 1.34.0-rc.0~1598
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=517f82d8d7b43590a341c9bc73991d638802a021;hp=166d09893ba8e962051d763102221387d5ad5fea;p=lhc%2Fweb%2Fwiklou.git

Merge "languages: Hard deprecate Language::getExtraUserToggles() method"
---

diff --git a/README b/README
index ad9b9d9d83..b9b2c8a381 100644
--- a/README
+++ b/README
@@ -23,7 +23,7 @@ RELEASE-NOTES, INSTALL, and UPGRADE.
 * Seeking help from a person?
 ** https://www.mediawiki.org/wiki/Special:MyLanguage/Communication
 * Looking to file a bug report or a feature request?
-** https://bugs.mediawiki.org/
+** https://phabricator.mediawiki.org/
 * Interested in helping out?
 ** https://www.mediawiki.org/wiki/Special:MyLanguage/How_to_contribute
 
diff --git a/includes/Block.php b/includes/Block.php
index 9f7f77d439..9fcaaf7888 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -1208,7 +1208,7 @@ class Block extends AbstractBlock {
 	 *  - Other softblocks are chosen over autoblocks
 	 *  - If there are multiple exact or range blocks at the same level, the one chosen
 	 *    is random
-	 * This should be used when $blocks where retrieved from the user's IP address
+	 * This should be used when $blocks were retrieved from the user's IP address
 	 * and $ipChain is populated from the same IP address information.
 	 *
 	 * @param array $blocks Array of Block objects
diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index 53ed133be2..66a4edfb1c 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -504,10 +504,11 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 					'md_skin' => $vary,
 					'md_deps' => $deps,
 				],
-				[ 'md_module', 'md_skin' ],
+				[ [ 'md_module', 'md_skin' ] ],
 				[
 					'md_deps' => $deps,
-				]
+				],
+				__METHOD__
 			);
 
 			if ( $dbw->trxLevel() ) {
diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index 4e541c9581..8c6ad2d074 100644
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -45,7 +45,7 @@ class SpecialBlockList extends SpecialPage {
 		$this->outputHeader();
 		$out = $this->getOutput();
 		$out->setPageTitle( $this->msg( 'ipblocklist' ) );
-		$out->addModuleStyles( [ 'mediawiki.special', 'mediawiki.special.blocklist' ] );
+		$out->addModuleStyles( [ 'mediawiki.special' ] );
 
 		$request = $this->getRequest();
 		$par = $request->getVal( 'ip', $par );
diff --git a/resources/Resources.php b/resources/Resources.php
index 1b8cffb28d..483e37426c 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2027,6 +2027,7 @@ return [
 			'resources/src/mediawiki.special/userrights.css',
 			'resources/src/mediawiki.special/watchlist.css',
 			'resources/src/mediawiki.special/block.less',
+			'resources/src/mediawiki.special/blocklist.less',
 		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
@@ -2129,10 +2130,6 @@ return [
 		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
-	'mediawiki.special.blocklist' => [
-		'styles' => 'resources/src/mediawiki.special/blocklist.less',
-		'targets' => [ 'desktop', 'mobile' ],
-	],
 	'mediawiki.special.changecredentials.js' => [
 		'scripts' => 'resources/src/mediawiki.special.changecredentials.js',
 		'dependencies' => [
diff --git a/resources/src/jquery/jquery.suggestions.js b/resources/src/jquery/jquery.suggestions.js
index a585cf384e..9e6ecc888d 100644
--- a/resources/src/jquery/jquery.suggestions.js
+++ b/resources/src/jquery/jquery.suggestions.js
@@ -776,7 +776,10 @@
 						}
 						$.suggestions.hide( context );
 						$.suggestions.cancel( context );
-					} );
+					} )
+					// Simulate a keypress on load. This loads the search suggestions when there are already
+					// typed characters before the JavaScript is loaded.
+					.trigger( 'keypress' );
 			}
 
 			// Store the context for next time