X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderStartUpModule.php;h=56fcb6c368d5a677783e5a8196859b8bd3bcebab;hb=d26ae7b17f48f3a84bb2e1934c16ead165a250a0;hp=df8126ed13bcbfcaf8f114e90faab1660c7c11aa;hpb=1791c928939f906627b9fb86c57ff8d9d626cbdb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index df8126ed13..56fcb6c368 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -385,6 +385,21 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 		return 'MediaWikiModuleStore:' . $this->getConfig()->get( 'DBname' );
 	}
 
+	/**
+	 * @see $wgResourceLoaderMaxQueryLength
+	 * @return int
+	 */
+	private function getMaxQueryLength() : int {
+		$len = $this->getConfig()->get( 'ResourceLoaderMaxQueryLength' );
+		// - Ignore -1, which in MW 1.34 and earlier was used to mean "unlimited".
+		// - Ignore invalid values, e.g. non-int or other negative values.
+		if ( $len === false || $len < 0 ) {
+			// Default
+			$len = 2000;
+		}
+		return $len;
+	}
+
 	/**
 	 * Get the key on which the JavaScript module cache (mw.loader.store) will vary.
 	 *
@@ -428,9 +443,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 		$mwLoaderPairs = [
 			'$VARS.reqBase' => $context->encodeJson( $context->getReqBase() ),
 			'$VARS.baseModules' => $context->encodeJson( $this->getBaseModules() ),
-			'$VARS.maxQueryLength' => $context->encodeJson(
-				$conf->get( 'ResourceLoaderMaxQueryLength' )
-			),
+			'$VARS.maxQueryLength' => $context->encodeJson( $this->getMaxQueryLength() ),
 			// The client-side module cache can be disabled by site configuration.
 			// It is also always disabled in debug mode.
 			'$VARS.storeEnabled' => $context->encodeJson(