Merge "resourceloader: Reduce width of module hash from 7 chars to 5"

diff --combined includes/resourceloader/ResourceLoaderStartUpModule.php
index 942b0e5,9cb8c4b..d4a34f3
--- 1/includes/resourceloader/ResourceLoaderStartUpModule.php
--- 2/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@@ -104,7 -104,6 +104,7 @@@ class ResourceLoaderStartUpModule exten
                        'wgContentNamespaces' => $nsInfo->getContentNamespaces(),
                        'wgSiteName' => $conf->get( 'Sitename' ),
                        'wgDBname' => $conf->get( 'DBname' ),
 +                      'wgWikiID' => WikiMap::getWikiIdFromDbDomain( WikiMap::getCurrentWikiDbDomain() ),
                        'wgExtraSignatureNamespaces' => $conf->get( 'ExtraSignatureNamespaces' ),
                        'wgExtensionAssetsPath' => $conf->get( 'ExtensionAssetsPath' ),
                        // MediaWiki sets cookies to have this prefix by default
@@@ -292,7 -291,7 +292,7 @@@
                                $states[$name] = 'error';
                        }
  
-                       if ( $versionHash !== '' && strlen( $versionHash ) !== 7 ) {
+                       if ( $versionHash !== '' && strlen( $versionHash ) !== ResourceLoader::HASH_LENGTH ) {
                                $e = new RuntimeException( "Badly formatted module version hash" );
                                $resourceLoader->outputErrorAndLog( $e,
                                                "Module '{module}' produced an invalid version hash: '{version}'.",

diff --combined resources/src/startup/mediawiki.js
index 3347cd4,bbe503d..21d95df
--- 1/resources/src/startup/mediawiki.js
--- 2/resources/src/startup/mediawiki.js
+++ b/resources/src/startup/mediawiki.js
@@@ -37,8 -37,8 +37,8 @@@
                        hash ^= str.charCodeAt( i );
                }
  
-               hash = ( hash >>> 0 ).toString( 36 );
-               while ( hash.length < 7 ) {
+               hash = ( hash >>> 0 ).toString( 36 ).slice( 0, 5 );
+               while ( hash.length < 5 ) {
                        hash = '0' + hash;
                }
                /* eslint-enable no-bitwise */
@@@ -1606,9 -1606,9 +1606,9 @@@
  
                                                // In addition to currReqBase, doRequest() will also add 'modules' and 'version'.
                                                // > '&modules='.length === 9
-                                               // > '&version=1234567'.length === 16
-                                               // > 9 + 16 = 25
-                                               currReqBaseLength = makeQueryString( currReqBase ).length + 25;
+                                               // > '&version=12345'.length === 14
+                                               // > 9 + 14 = 23
+                                               currReqBaseLength = makeQueryString( currReqBase ).length + 23;
  
                                                // We may need to split up the request to honor the query string length limit,
                                                // so build it piece by piece.
@@@ -2453,7 -2453,24 +2453,7 @@@
                                        }() )
                                }
                        };
 -              }() ),
 -
 -              // Skeleton user object, extended by the 'mediawiki.user' module.
 -              /**
 -               * @class mw.user
 -               * @singleton
 -               */
 -              user: {
 -                      /**
 -                       * @property {mw.Map}
 -                       */
 -                      options: new Map(),
 -                      /**
 -                       * @property {mw.Map}
 -                       */
 -                      tokens: new Map()
 -              }
 -
 +              }() )
        };
  
        // Attach to window and globally alias