Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 94 insertions, 49 deletions

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index f3117378..43f1dbd2 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -21,20 +21,24 @@
  */
 
 class ResourceLoaderStartUpModule extends ResourceLoaderModule {
-	
+
 	/* Protected Members */
 
 	protected $modifiedTime = array();
 
 	/* Protected Methods */
-	
+
+	/**
+	 * @param $context ResourceLoaderContext
+	 * @return array
+	 */
 	protected function getConfig( $context ) {
-		global $wgLoadScript, $wgScript, $wgStylePath, $wgScriptExtension, 
-			$wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, 
-			$wgVariantArticlePath, $wgActionPaths, $wgUseAjax, $wgVersion, 
-			$wgEnableAPI, $wgEnableWriteAPI, $wgDBname, $wgEnableMWSuggest, 
+		global $wgLoadScript, $wgScript, $wgStylePath, $wgScriptExtension,
+			$wgArticlePath, $wgScriptPath, $wgServer, $wgContLang,
+			$wgVariantArticlePath, $wgActionPaths, $wgUseAjax, $wgVersion,
+			$wgEnableAPI, $wgEnableWriteAPI, $wgDBname, $wgEnableMWSuggest,
 			$wgSitename, $wgFileExtensions, $wgExtensionAssetsPath,
-			$wgResourceLoaderMaxQueryLength;
+			$wgCookiePrefix, $wgResourceLoaderMaxQueryLength, $wgLegacyJavaScriptGlobals;
 
 		// Pre-process information
 		$separatorTransTable = $wgContLang->separatorTransformTable();
@@ -50,7 +54,21 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 			implode( "\t", $digitTransTable ),
 		);
 		$mainPage = Title::newMainPage();
-		
+
+		/**
+		 * Namespace related preparation
+		 * - wgNamespaceIds: Key-value pairs of all localized, canonical and aliases for namespaces.
+		 * - wgCaseSensitiveNamespaces: Array of namespaces that are case-sensitive.
+		 */
+		$namespaceIds = $wgContLang->getNamespaceIds();
+		$caseSensitiveNamespaces = array();
+		foreach( MWNamespace::getCanonicalNamespaces() as $index => $name ) {
+			$namespaceIds[$wgContLang->lc( $name )] = $index;
+			if ( !MWNamespace::isCapitalized( $index ) ) {
+				$caseSensitiveNamespaces[] = $index;
+			}
+		}
+
 		// Build list of variables
 		$vars = array(
 			'wgLoadScript' => $wgLoadScript,
@@ -70,29 +88,37 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 			'wgVersion' => $wgVersion,
 			'wgEnableAPI' => $wgEnableAPI,
 			'wgEnableWriteAPI' => $wgEnableWriteAPI,
+			'wgDefaultDateFormat' => $wgContLang->getDefaultDateFormat(),
+			'wgMonthNames' => $wgContLang->getMonthNamesArray(),
+			'wgMonthNamesShort' => $wgContLang->getMonthAbbreviationsArray(),
 			'wgSeparatorTransformTable' => $compactSeparatorTransTable,
 			'wgDigitTransformTable' => $compactDigitTransTable,
 			'wgMainPageTitle' => $mainPage ? $mainPage->getPrefixedText() : null,
 			'wgFormattedNamespaces' => $wgContLang->getFormattedNamespaces(),
-			'wgNamespaceIds' => $wgContLang->getNamespaceIds(),
+			'wgNamespaceIds' => $namespaceIds,
 			'wgSiteName' => $wgSitename,
 			'wgFileExtensions' => array_values( $wgFileExtensions ),
 			'wgDBname' => $wgDBname,
+			// This sucks, it is only needed on Special:Upload, but I could
+			// not find a way to add vars only for a certain module
+			'wgFileCanRotate' => BitmapHandler::canRotate(),
+			'wgAvailableSkins' => Skin::getSkinNames(),
 			'wgExtensionAssetsPath' => $wgExtensionAssetsPath,
+			// MediaWiki sets cookies to have this prefix by default
+			'wgCookiePrefix' => $wgCookiePrefix,
 			'wgResourceLoaderMaxQueryLength' => $wgResourceLoaderMaxQueryLength,
+			'wgLegacyJavaScriptGlobals' => $wgLegacyJavaScriptGlobals,
+			'wgCaseSensitiveNamespaces' => $caseSensitiveNamespaces,
 		);
-		if ( $wgContLang->hasVariants() ) {
-			$vars['wgUserVariant'] = $wgContLang->getPreferredVariant();
-		}
 		if ( $wgUseAjax && $wgEnableMWSuggest ) {
 			$vars['wgMWSuggestTemplate'] = SearchEngine::getMWSuggestTemplate();
 		}
-		
+
 		wfRunHooks( 'ResourceLoaderGetConfigVars', array( &$vars ) );
-		
+
 		return $vars;
 	}
-	
+
 	/**
 	 * Gets registration code for all modules
 	 *
@@ -102,7 +128,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 	public static function getModuleRegistrations( ResourceLoaderContext $context ) {
 		global $wgCacheEpoch;
 		wfProfileIn( __METHOD__ );
-		
+
 		$out = '';
 		$registrations = array();
 		$resourceLoader = $context->getResourceLoader();
@@ -113,8 +139,8 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 			if ( $loader !== false ) {
 				$deps = $module->getDependencies();
 				$group = $module->getGroup();
-				$version = wfTimestamp( TS_ISO_8601_BASIC, 
-					round( $module->getModifiedTime( $context ), -2 ) );
+				$version = wfTimestamp( TS_ISO_8601_BASIC,
+					$module->getModifiedTime( $context ) );
 				$out .= ResourceLoader::makeCustomLoaderScript( $name, $version, $deps, $group, $loader );
 			}
 			// Automatically register module
@@ -123,19 +149,19 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 				// seem to do that, and custom implementations might forget. Coerce it to TS_UNIX
 				$moduleMtime = wfTimestamp( TS_UNIX, $module->getModifiedTime( $context ) );
 				$mtime = max( $moduleMtime, wfTimestamp( TS_UNIX, $wgCacheEpoch ) );
-				// Modules without dependencies or a group pass two arguments (name, timestamp) to 
-				// mediaWiki.loader.register()
+				// Modules without dependencies or a group pass two arguments (name, timestamp) to
+				// mw.loader.register()
 				if ( !count( $module->getDependencies() && $module->getGroup() === null ) ) {
 					$registrations[] = array( $name, $mtime );
 				}
-				// Modules with dependencies but no group pass three arguments 
-				// (name, timestamp, dependencies) to mediaWiki.loader.register()
-				else if ( $module->getGroup() === null ) {
+				// Modules with dependencies but no group pass three arguments
+				// (name, timestamp, dependencies) to mw.loader.register()
+				elseif ( $module->getGroup() === null ) {
 					$registrations[] = array(
 						$name, $mtime,  $module->getDependencies() );
 				}
-				// Modules with dependencies pass four arguments (name, timestamp, dependencies, group) 
-				// to mediaWiki.loader.register()
+				// Modules with dependencies pass four arguments (name, timestamp, dependencies, group)
+				// to mw.loader.register()
 				else {
 					$registrations[] = array(
 						$name, $mtime,  $module->getDependencies(), $module->getGroup() );
@@ -143,52 +169,74 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 			}
 		}
 		$out .= ResourceLoader::makeLoaderRegisterScript( $registrations );
-		
+
 		wfProfileOut( __METHOD__ );
 		return $out;
 	}
 
 	/* Methods */
 
+	/**
+	 * @param $context ResourceLoaderContext
+	 * @return string
+	 */
 	public function getScript( ResourceLoaderContext $context ) {
-		global $IP, $wgLoadScript;
+		global $IP, $wgLoadScript, $wgLegacyJavaScriptGlobals;
 
 		$out = file_get_contents( "$IP/resources/startup.js" );
 		if ( $context->getOnly() === 'scripts' ) {
-			// Build load query for jquery and mediawiki modules
+
+			// The core modules:
+			$modules = array( 'jquery', 'mediawiki' );
+			wfRunHooks( 'ResourceLoaderGetStartupModules', array( &$modules ) );
+
+			// Get the latest version
+			$version = 0;
+			foreach ( $modules as $moduleName ) {
+				$version = max( $version,
+					$context->getResourceLoader()->getModule( $moduleName )->getModifiedTime( $context )
+				);
+			}
+			// Build load query for StartupModules
 			$query = array(
-				'modules' => implode( '|', array( 'jquery', 'mediawiki' ) ),
+				'modules' => ResourceLoader::makePackedModulesString( $modules ),
 				'only' => 'scripts',
 				'lang' => $context->getLanguage(),
 				'skin' => $context->getSkin(),
 				'debug' => $context->getDebug() ? 'true' : 'false',
-				'version' => wfTimestamp( TS_ISO_8601_BASIC, round( max(
-					$context->getResourceLoader()->getModule( 'jquery' )->getModifiedTime( $context ),
-					$context->getResourceLoader()->getModule( 'mediawiki' )->getModifiedTime( $context )
-				), -2 ) )
+				'version' => wfTimestamp( TS_ISO_8601_BASIC, $version )
 			);
 			// Ensure uniform query order
 			ksort( $query );
-			
+
 			// Startup function
 			$configuration = $this->getConfig( $context );
 			$registrations = self::getModuleRegistrations( $context );
-			$out .= "var startUp = function() {\n" . 
-				"\t$registrations\n" . 
-				"\t" . Xml::encodeJsCall( 'mediaWiki.config.set', array( $configuration ) ) . 
+			$out .= "var startUp = function() {\n" .
+				"\tmw.config = new " . Xml::encodeJsCall( 'mw.Map', array( $wgLegacyJavaScriptGlobals ) ) . "\n" .
+				"\t$registrations\n" .
+				"\t" . Xml::encodeJsCall( 'mw.config.set', array( $configuration ) ) .
 				"};\n";
-			
+
 			// Conditional script injection
 			$scriptTag = Html::linkedScript( $wgLoadScript . '?' . wfArrayToCGI( $query ) );
-			$out .= "if ( isCompatible() ) {\n" . 
-				"\t" . Xml::encodeJsCall( 'document.write', array( $scriptTag ) ) . 
-				"}\n" . 
+			$out .= "if ( isCompatible() ) {\n" .
+				"\t" . Xml::encodeJsCall( 'document.write', array( $scriptTag ) ) .
+				"}\n" .
 				"delete isCompatible;";
 		}
 
 		return $out;
 	}
 
+	public function supportsURLLoading() {
+		return false;
+	}
+
+	/**
+	 * @param $context ResourceLoaderContext
+	 * @return array|mixed
+	 */
 	public function getModifiedTime( ResourceLoaderContext $context ) {
 		global $IP, $wgCacheEpoch;
 
@@ -204,7 +252,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 
 		$this->modifiedTime[$hash] = filemtime( "$IP/resources/startup.js" );
 		// ATTENTION!: Because of the line above, this is not going to cause
-		// infinite recursion - think carefully before making changes to this 
+		// infinite recursion - think carefully before making changes to this
 		// code!
 		$time = wfTimestamp( TS_UNIX, $wgCacheEpoch );
 		foreach ( $loader->getModuleNames() as $name ) {
@@ -214,14 +262,11 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 		return $this->modifiedTime[$hash] = $time;
 	}
 
-	public function getFlip( $context ) {
-		global $wgContLang;
-
-		return $wgContLang->getDir() !== $context->getDirection();
-	}
-	
 	/* Methods */
-	
+
+	/**
+	 * @return string
+	 */
 	public function getGroup() {
 		return 'startup';
 	}