X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FOutputPage.php;h=fd527d257dc33b256d5ac37f08e5d00dc33f0290;hb=fb80a53b1ba3c0c5dc9b01b2a058b716a046461d;hp=93f245fb4b441cf9369da78ac655a0e4502155bb;hpb=ce8f81837c17729d9d6794f3097ee81458ac9ea3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 93f245fb4b..fd527d257d 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -23,8 +23,9 @@ class OutputPage {
 	var $mLastModified = '', $mETag = false;
 	var $mCategoryLinks = array(), $mCategories = array(), $mLanguageLinks = array();
 
-	var $mScripts = '', $mLinkColours, $mPageLinkTitle = '', $mHeadItems = array();
+	var $mScripts = '', $mInlineStyles = '', $mLinkColours, $mPageLinkTitle = '', $mHeadItems = array();
 	var $mModules = array(), $mModuleScripts = array(), $mModuleStyles = array(), $mModuleMessages = array();
+	var $mResourceLoader;
 	var $mInlineMsg = array();
 
 	var $mTemplateIds = array();
@@ -47,6 +48,7 @@ class OutputPage {
 	var $mPageTitleActionText = '';
 	var $mParseWarnings = array();
 	var $mSquidMaxage = 0;
+	var $mPreventClickjacking = true;
 	var $mRevisionId = null;
 	protected $mTitle = null;
 
@@ -562,11 +564,6 @@ class OutputPage {
 		$nameWithTags = Sanitizer::normalizeCharReferences( Sanitizer::removeHTMLtags( $name ) );
 		$this->mPagetitle = $nameWithTags;
 
-		$taction = $this->getPageTitleActionText();
-		if( !empty( $taction ) ) {
-			$name .= ' - '.$taction;
-		}
-
 		# change "<i>foo&amp;bar</i>" to "foo&bar"
 		$this->setHTMLTitle( wfMsg( 'pagetitle', Sanitizer::stripAllTags( $nameWithTags ) ) );
 	}
@@ -1003,14 +1000,6 @@ class OutputPage {
 		$this->mDebugtext .= $text;
 	}
 
-	/**
-	 * @deprecated use parserOptions() instead
-	 */
-	public function setParserOptions( $options ) {
-		wfDeprecated( __METHOD__ );
-		return $this->parserOptions( $options );
-	}
-
 	/**
 	 * Get/set the ParserOptions object to use for wikitext parsing
 	 *
@@ -1121,43 +1110,6 @@ class OutputPage {
 		wfProfileOut( __METHOD__ );
 	}
 
-	/**
-	 * Add wikitext to the buffer, assuming that this is the primary text for a page view
-	 * Saves the text into the parser cache if possible.
-	 *
-	 * @param $text String: wikitext
-	 * @param $article Article object
-	 * @param $cache Boolean
-	 * @deprecated Use Article::outputWikitext
-	 */
-	public function addPrimaryWikiText( $text, $article, $cache = true ) {
-		global $wgParser;
-
-		wfDeprecated( __METHOD__ );
-
-		$popts = $this->parserOptions();
-		$popts->setTidy( true );
-		$parserOutput = $wgParser->parse(
-			$text, $article->mTitle,
-			$popts, true, true, $this->mRevisionId
-		);
-		$popts->setTidy( false );
-		if ( $cache && $article && $parserOutput->isCacheable() ) {
-			$parserCache = ParserCache::singleton();
-			$parserCache->save( $parserOutput, $article, $popts );
-		}
-
-		$this->addParserOutput( $parserOutput );
-	}
-
-	/**
-	 * @deprecated use addWikiTextTidy()
-	 */
-	public function addSecondaryWikiText( $text, $linestart = true ) {
-		wfDeprecated( __METHOD__ );
-		$this->addWikiTextTitleTidy( $text, $this->getTitle(), $linestart );
-	}
-
 	/**
 	 * Add a ParserOutput object, but without Html
 	 *
@@ -1230,24 +1182,37 @@ class OutputPage {
 	 * @param $interface Boolean: use interface language ($wgLang instead of
 	 *                   $wgContLang) while parsing language sensitive magic
 	 *                   words like GRAMMAR and PLURAL
+	 * @param $language  Language object: target language object, will override
+	 *                   $interface
 	 * @return String: HTML
 	 */
-	public function parse( $text, $linestart = true, $interface = false ) {
+	public function parse( $text, $linestart = true, $interface = false, $language = null ) {
 		global $wgParser;
+
 		if( is_null( $this->getTitle() ) ) {
 			throw new MWException( 'Empty $mTitle in ' . __METHOD__ );
 		}
+
 		$popts = $this->parserOptions();
 		if ( $interface ) {
 			$popts->setInterfaceMessage( true );
 		}
+		if ( $language !== null ) {
+			$oldLang = $popts->setTargetLanguage( $language );
+		}
+
 		$parserOutput = $wgParser->parse(
 			$text, $this->getTitle(), $popts,
 			$linestart, true, $this->mRevisionId
 		);
+
 		if ( $interface ) {
 			$popts->setInterfaceMessage( false );
 		}
+		if ( $language !== null ) {
+			$popts->setTargetLanguage( $oldLang );
+		}
+
 		return $parserOutput->getText();
 	}
 
@@ -1272,24 +1237,6 @@ class OutputPage {
 		return $parsed;
 	}
 
-	/**
-	 * @deprecated
-	 *
-	 * @param $article Article
-	 * @return Boolean: true if successful, else false.
-	 */
-	public function tryParserCache( &$article ) {
-		wfDeprecated( __METHOD__ );
-		$parserOutput = ParserCache::singleton()->get( $article, $article->getParserOptions() );
-
-		if ( $parserOutput !== false ) {
-			$this->addParserOutput( $parserOutput );
-			return true;
-		} else {
-			return false;
-		}
-	}
-
 	/**
 	 * Set the value of the "s-maxage" part of the "Cache-control" HTTP header
 	 *
@@ -1429,13 +1376,58 @@ class OutputPage {
 				if( $variant === $wgContLang->getCode() ) {
 					continue;
 				} else {
-					$aloption[] = "string-contains=$variant";
+					$aloption[] = 'string-contains=' . $variant;
+					
+					// IE and some other browsers use another form of language code
+					// in their Accept-Language header, like "zh-CN" or "zh-TW".
+					// We should handle these too.
+					$ievariant = explode( '-', $variant );
+					if ( count( $ievariant ) == 2 ) {
+						$ievariant[1] = strtoupper( $ievariant[1] );
+						$ievariant = implode( '-', $ievariant );
+						$aloption[] = 'string-contains=' . $ievariant;
+					}
 				}
 			}
 			$this->addVaryHeader( 'Accept-Language', $aloption );
 		}
 	}
 
+	/**
+	 * Set a flag which will cause an X-Frame-Options header appropriate for 
+	 * edit pages to be sent. The header value is controlled by 
+	 * $wgEditPageFrameOptions.
+	 *
+	 * This is the default for special pages. If you display a CSRF-protected 
+	 * form on an ordinary view page, then you need to call this function.
+	 */
+	public function preventClickjacking( $enable = true ) {
+		$this->mPreventClickjacking = $enable;
+	}
+
+	/**
+	 * Turn off frame-breaking. Alias for $this->preventClickjacking(false).
+	 * This can be called from pages which do not contain any CSRF-protected
+	 * HTML form.
+	 */
+	public function allowClickjacking() {
+		$this->mPreventClickjacking = false;
+	}
+
+	/**
+	 * Get the X-Frame-Options header value (without the name part), or false 
+	 * if there isn't one. This is used by Skin to determine whether to enable 
+	 * JavaScript frame-breaking, for clients that don't support X-Frame-Options.
+	 */
+	public function getFrameOptions() {
+		global $wgBreakFrames, $wgEditPageFrameOptions;
+		if ( $wgBreakFrames ) {
+			return 'DENY';
+		} elseif ( $this->mPreventClickjacking && $wgEditPageFrameOptions ) {
+			return $wgEditPageFrameOptions;
+		}
+	}
+
 	/**
 	 * Send cache control HTTP headers
 	 */
@@ -1572,7 +1564,6 @@ class OutputPage {
 		global $wgLanguageCode, $wgDebugRedirects, $wgMimeType;
 		global $wgUseAjax, $wgAjaxWatch;
 		global $wgEnableMWSuggest, $wgUniversalEditButton;
-		global $wgArticle;
 
 		if( $this->mDoNothing ) {
 			return;
@@ -1609,10 +1600,10 @@ class OutputPage {
 		}
 
 		$sk = $wgUser->getSkin();
-		
+
 		// Add base resources
-		$this->addModules( array( 'mediawiki.legacy.wikibits' ) );
-		
+		$this->addModules( array( 'mediawiki.legacy.wikibits', 'mediawiki.util' ) );
+
 		// Add various resources if required
 		if ( $wgUseAjax ) {
 			$this->addModules( 'mediawiki.legacy.ajax' );
@@ -1620,7 +1611,7 @@ class OutputPage {
 			wfRunHooks( 'AjaxAddScript', array( &$this ) );
 
 			if( $wgAjaxWatch && $wgUser->isLoggedIn() ) {
-				$this->addModules( 'mediawiki.legacy.ajaxwatch' );
+				$this->addModules( 'mediawiki.action.watch.ajax' );
 			}
 
 			if ( $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ) {
@@ -1629,11 +1620,11 @@ class OutputPage {
 		}
 
 		if( $wgUser->getBoolOption( 'editsectiononrightclick' ) ) {
-			$this->addModules( 'mediawiki.legacy.rightclickedit' );
+			$this->addModules( 'mediawiki.action.view.rightClickEdit' );
 		}
 
 		if( $wgUniversalEditButton ) {
-			if( isset( $wgArticle ) && $this->getTitle() && $this->getTitle()->quickUserCan( 'edit' )
+			if( $this->isArticleRelated() && $this->getTitle() && $this->getTitle()->quickUserCan( 'edit' )
 				&& ( $this->getTitle()->exists() || $this->getTitle()->quickUserCan( 'create' ) ) ) {
 				// Original UniversalEditButton
 				$msg = wfMsg( 'edit' );
@@ -1659,6 +1650,12 @@ class OutputPage {
 		$wgRequest->response()->header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
 		$wgRequest->response()->header( 'Content-language: ' . $wgLanguageCode );
 
+		// Prevent framing, if requested
+		$frameOptions = $this->getFrameOptions();
+		if ( $frameOptions ) {
+			$wgRequest->response()->header( "X-Frame-Options: $frameOptions" );
+		}
+
 		if ( $this->mArticleBodyOnly ) {
 			$this->out( $this->mBodytext );
 		} else {
@@ -1695,32 +1692,6 @@ class OutputPage {
 		print $outs;
 	}
 
-	/**
-	 * @todo document
-	 */
-	public static function setEncodings() {
-		global $wgInputEncoding, $wgOutputEncoding;
-
-		$wgInputEncoding = strtolower( $wgInputEncoding );
-
-		if ( empty( $_SERVER['HTTP_ACCEPT_CHARSET'] ) ) {
-			$wgOutputEncoding = strtolower( $wgOutputEncoding );
-			return;
-		}
-		$wgOutputEncoding = $wgInputEncoding;
-	}
-
-	/**
-	 * @deprecated use wfReportTime() instead.
-	 *
-	 * @return String
-	 */
-	public function reportTime() {
-		wfDeprecated( __METHOD__ );
-		$time = wfReportTime();
-		return $time;
-	}
-
 	/**
 	 * Produce a "user is blocked" page.
 	 *
@@ -1811,9 +1782,7 @@ class OutputPage {
 		$this->mRedirect = '';
 		$this->mBodytext = '';
 
-		array_unshift( $params, 'parse' );
-		array_unshift( $params, $msg );
-		$this->addHTML( call_user_func_array( 'wfMsgExt', $params ) );
+		$this->addWikiMsgArray( $msg, $params );
 
 		$this->returnToMain();
 	}
@@ -1898,7 +1867,7 @@ class OutputPage {
 		$this->setPageTitle( wfMsg( 'loginreqtitle' ) );
 		$this->setHtmlTitle( wfMsg( 'errorpagetitle' ) );
 		$this->setRobotPolicy( 'noindex,nofollow' );
-		$this->setArticleFlag( false );
+		$this->setArticleRelated( false );
 
 		$loginTitle = SpecialPage::getTitleFor( 'Userlogin' );
 		$loginLink = $skin->link(
@@ -2044,7 +2013,6 @@ class OutputPage {
 	 * @return none
 	 */
 	public function addPasswordSecurity( $passwordId, $retypeId ) {
-		$this->includeJQuery();
 		$data = array(
 			'password' => '#' . $passwordId,
 			'retype' => '#' . $retypeId,
@@ -2059,53 +2027,6 @@ class OutputPage {
 		$this->addModules( 'mediawiki.legacy.password' );
 	}
 
-	/** @deprecated */
-	public function errorpage( $title, $msg ) {
-		wfDeprecated( __METHOD__ );
-		throw new ErrorPageError( $title, $msg );
-	}
-
-	/** @deprecated */
-	public function databaseError( $fname, $sql, $error, $errno ) {
-		throw new MWException( "OutputPage::databaseError is obsolete\n" );
-	}
-
-	/** @deprecated */
-	public function fatalError( $message ) {
-		wfDeprecated( __METHOD__ );
-		throw new FatalError( $message );
-	}
-
-	/** @deprecated */
-	public function unexpectedValueError( $name, $val ) {
-		wfDeprecated( __METHOD__ );
-		throw new FatalError( wfMsg( 'unexpected', $name, $val ) );
-	}
-
-	/** @deprecated */
-	public function fileCopyError( $old, $new ) {
-		wfDeprecated( __METHOD__ );
-		throw new FatalError( wfMsg( 'filecopyerror', $old, $new ) );
-	}
-
-	/** @deprecated */
-	public function fileRenameError( $old, $new ) {
-		wfDeprecated( __METHOD__ );
-		throw new FatalError( wfMsg( 'filerenameerror', $old, $new ) );
-	}
-
-	/** @deprecated */
-	public function fileDeleteError( $name ) {
-		wfDeprecated( __METHOD__ );
-		throw new FatalError( wfMsg( 'filedeleteerror', $name ) );
-	}
-
-	/** @deprecated */
-	public function fileNotFoundError( $name ) {
-		wfDeprecated( __METHOD__ );
-		throw new FatalError( wfMsg( 'filenotfound', $name ) );
-	}
-
 	public function showFatalError( $message ) {
 		$this->setPageTitle( wfMsg( 'internalerror' ) );
 		$this->setRobotPolicy( 'noindex,nofollow' );
@@ -2226,12 +2147,9 @@ class OutputPage {
 
 		$ret .= implode( "\n", array(
 			$this->getHeadLinks( $sk ),
-			$this->buildCssLinks(),
-			$this->getHeadItems(),
+			$this->buildCssLinks( $sk ),
+			$this->getHeadItems()
 		) );
-		if ( $sk->usercss ) {
-			$ret .= Html::inlineStyle( $sk->usercss );
-		}
 
 		if ( $wgUseTrackbacks && $this->isArticleRelated() ) {
 			$ret .= $this->getTitle()->trackbackRDF();
@@ -2275,29 +2193,144 @@ class OutputPage {
 		$bodyAttrs['class'] .= ' ' . Sanitizer::escapeClass( 'page-' . $this->getTitle()->getPrefixedText() );
 		$bodyAttrs['class'] .= ' skin-' . Sanitizer::escapeClass( $wgUser->getSkin()->getSkinName() );
 
+		$sk->addToBodyAttributes( $this, $bodyAttrs ); // Allow skins to add body attributes they need
+		wfRunHooks( 'OutputPageBodyAttributes', array( $this, $sk, &$bodyAttrs ) );
+
 		$ret .= Html::openElement( 'body', $bodyAttrs ) . "\n";
 
 		return $ret;
 	}
-	
-	static function makeResourceLoaderLink( $skin, $modules, $only ) {
-		global $wgUser, $wgLang, $wgRequest, $wgLoadScript;
+
+	/**
+	 * Get a ResourceLoader object associated with this OutputPage
+	 */
+	public function getResourceLoader() {
+		if ( is_null( $this->mResourceLoader ) ) {
+			$this->mResourceLoader = new ResourceLoader();
+		}
+		return $this->mResourceLoader;
+	}		
+
+	/**
+	 * TODO: Document
+	 * @param $skin Skin
+	 * @param $modules Array/string with the module name
+	 * @param $only string May be styles, messages or scripts
+	 * @param $useESI boolean
+	 * @return string html <script> and <style> tags
+	 */
+	protected function makeResourceLoaderLink( Skin $skin, $modules, $only, $useESI = false ) {
+		global $wgUser, $wgLang, $wgLoadScript, $wgResourceLoaderUseESI,
+			$wgResourceLoaderInlinePrivateModules, $wgRequest;
+		// Lazy-load ResourceLoader
 		// TODO: Should this be a static function of ResourceLoader instead?
+		// TODO: Divide off modules starting with "user", and add the user parameter to them
 		$query = array(
-			'modules' => implode( '|', array_unique( (array) $modules ) ),
 			'lang' => $wgLang->getCode(),
-			'debug' => $wgRequest->getBool( 'debug' ) && $wgRequest->getVal( 'debug' ) !== 'false',
-			'skin' => $wgUser->getSkin()->getSkinName(),
+			'debug' => ResourceLoader::inDebugMode() ? 'true' : 'false',
+			'skin' => $skin->getSkinName(),
 			'only' => $only,
 		);
-		// Automatically select style/script elements
-		if ( $only === 'styles' ) {
-			return Html::linkedStyle( wfAppendQuery( $wgLoadScript, $query ) );
-		} else {
-			return Html::linkedScript( wfAppendQuery( $wgLoadScript, $query ) );
+		// Propagate printable and handheld parameters if present
+		if ( $wgRequest->getBool( 'printable' ) ) {
+			$query['printable'] = 1;
+		}
+		if ( $wgRequest->getBool( 'handheld' ) ) {
+			$query['handheld'] = 1;
+		}
+		
+		if ( !count( $modules ) ) {
+			return '';
+		}
+		
+		if ( count( $modules ) > 1 ) {
+			// Remove duplicate module requests
+			$modules = array_unique( (array) $modules );
+			// Sort module names so requests are more uniform
+			sort( $modules );
+		
+			if ( ResourceLoader::inDebugMode() ) {
+				// Recursively call us for every item
+				$links = '';
+				foreach ( $modules as $name ) {
+					$links .= $this->makeResourceLoaderLink( $skin, $name, $only, $useESI );
+				}
+				return $links;
+			}
+		}
+		
+		// Create keyed-by-group list of module objects from modules list
+		$groups = array();
+		$resourceLoader = $this->getResourceLoader();
+		foreach ( (array) $modules as $name ) {
+			$module = $resourceLoader->getModule( $name );
+			$group = $module->getGroup();
+			if ( !isset( $groups[$group] ) ) {
+				$groups[$group] = array();
+			}
+			$groups[$group][$name] = $module;
+		}
+		$links = '';
+		foreach ( $groups as $group => $modules ) {
+			$query['modules'] = implode( '|', array_keys( $modules ) );
+			// Special handling for user-specific groups
+			if ( ( $group === 'user' || $group === 'private' ) && $wgUser->isLoggedIn() ) {
+				$query['user'] = $wgUser->getName();
+			}
+			// Support inlining of private modules if configured as such
+			if ( $group === 'private' && $wgResourceLoaderInlinePrivateModules ) {
+				$context = new ResourceLoaderContext( $resourceLoader, new FauxRequest( $query ) );
+				if ( $only == 'styles' ) {
+					$links .= Html::inlineStyle(
+						$resourceLoader->makeModuleResponse( $context, $modules )
+					);
+				} else {
+					$links .= Html::inlineScript(
+						ResourceLoader::makeLoaderConditionalScript(
+							$resourceLoader->makeModuleResponse( $context, $modules )
+						)
+					);
+				}
+				continue;
+			}
+			// Special handling for user and site groups; because users might change their stuff
+			// on-wiki like site or user pages, or user preferences; we need to find the highest
+			// timestamp of these user-changable modules so we can ensure cache misses on change
+			if ( $group === 'user' || $group === 'site' ) {
+				// Create a fake request based on the one we are about to make so modules return
+				// correct times
+				$context = new ResourceLoaderContext( $resourceLoader, new FauxRequest( $query ) );
+				// Get the maximum timestamp
+				$timestamp = 1;
+				foreach ( $modules as $module ) {
+					$timestamp = max( $timestamp, $module->getModifiedTime( $context ) );
+				}
+				// Add a version parameter so cache will break when things change
+				$query['version'] = wfTimestamp( TS_ISO_8601_BASIC, round( $timestamp, -2 ) );
+			}
+			// Make queries uniform in order
+			ksort( $query );
+
+			$url = wfAppendQuery( $wgLoadScript, $query );
+			if ( $useESI && $wgResourceLoaderUseESI ) {
+				$esi = Xml::element( 'esi:include', array( 'src' => $url ) );
+				if ( $only == 'styles' ) {
+					$links .= Html::inlineStyle( $esi );
+				} else {
+					$links .= Html::inlineScript( $esi );
+				}
+			} else {
+				// Automatically select style/script elements
+				if ( $only === 'styles' ) {
+					$links .= Html::linkedStyle( wfAppendQuery( $wgLoadScript, $query ) ) . "\n";
+				} else {
+					$links .= Html::linkedScript( wfAppendQuery( $wgLoadScript, $query ) ) . "\n";
+				}
+			}
 		}
+		return $links;
 	}
-	
+
 	/**
 	 * Gets the global variables and mScripts; also adds userjs to the end if
 	 * enabled. Despite the name, these scripts are no longer put in the
@@ -2307,68 +2340,53 @@ class OutputPage {
 	 * @return String: HTML fragment
 	 */
 	function getHeadScripts( Skin $sk ) {
-		global $wgUser, $wgRequest, $wgJsMimeType;
-		global $wgUseSiteJs;
-		
-		// Statup - this will immediately load jquery and mediawiki modules
-		$scripts = self::makeResourceLoaderLink( $sk, 'startup', 'scripts' );
-		
-		// Configuration -- this could be merged together with the load and go, but makeGlobalVariablesScript returns a
-		// whole script tag -- grumble grumble
+		global $wgUser, $wgRequest, $wgUseSiteJs;
+
+		// Startup - this will immediately load jquery and mediawiki modules
+		$scripts = $this->makeResourceLoaderLink( $sk, 'startup', 'scripts', true );
+
+		// Configuration -- This could be merged together with the load and go, but
+		// makeGlobalVariablesScript returns a whole script tag -- grumble grumble...
 		$scripts .= Skin::makeGlobalVariablesScript( $sk->getSkinName() ) . "\n";
-		
-		// Script and Messages "only"
-		if ( $wgRequest->getBool( 'debug' ) && $wgRequest->getVal( 'debug' ) !== 'false' ) {
-			// Scripts
-			foreach ( $this->getModuleScripts() as $name ) {
-				$scripts .= self::makeResourceLoaderLink( $sk, $name, 'scripts' );
-			}
-			// Messages
-			foreach ( $this->getModuleMessages() as $name ) {
-				$scripts .= self::makeResourceLoaderLink( $sk, $name, 'messages' );
-			}
-		} else {
-			// Scripts
-			if ( count( $this->getModuleScripts() ) ) {
-				$scripts .= self::makeResourceLoaderLink( $sk, $this->getModuleScripts(), 'scripts' );
-			}
-			// Messages
-			if ( count( $this->getModuleMessages() ) ) {
-				$scripts .= self::makeResourceLoaderLink( $sk, $this->getModuleMessages(), 'messages' );
-			}
-		}
-		
-		// Modules - let the client calculate dependencies and batch requests as it likes
+
+		// Script and Messages "only" requests
+		$scripts .= $this->makeResourceLoaderLink( $sk, $this->getModuleScripts(), 'scripts' );
+		$scripts .= $this->makeResourceLoaderLink( $sk, $this->getModuleMessages(), 'messages' );
+
+		// Modules requests - let the client calculate dependencies and batch requests as it likes
 		if ( $this->getModules() ) {
-			$modules = FormatJson::encode( $this->getModules() );
 			$scripts .= Html::inlineScript(
-				"if ( mediaWiki !== undefined ) { mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go(); }"
-			);
+				ResourceLoader::makeLoaderConditionalScript(
+					Xml::encodeJsCall( 'mediaWiki.loader.load', array( $this->getModules() ) ) .
+					Xml::encodeJsCall( 'mediaWiki.loader.go', array() )
+				)
+			) . "\n";
 		}
-		
-		// TODO: User Scripts should be included using the resource loader
-		// Add user JS if enabled
-		if( $this->isUserJsAllowed() && $wgUser->isLoggedIn() ) {
+
+		// Legacy Scripts
+		$scripts .= "\n" . $this->mScripts;
+
+		// Add site JS if enabled
+		if ( $wgUseSiteJs ) {
+			$scripts .= $this->makeResourceLoaderLink( $sk, 'site', 'scripts' );
+		}
+
+		// Add user JS if enabled - trying to load user.options as a bundle if possible
+		$userOptionsAdded = false;
+		if ( $this->isUserJsAllowed() && $wgUser->isLoggedIn() ) {
 			$action = $wgRequest->getVal( 'action', 'view' );
 			if( $this->mTitle && $this->mTitle->isJsSubpage() && $sk->userCanPreview( $action ) ) {
 				# XXX: additional security check/prompt?
-				$this->addInlineScript( $wgRequest->getText( 'wpTextbox1' ) );
+				$scripts .= Html::inlineScript( "\n" . $wgRequest->getText( 'wpTextbox1' ) . "\n" ) . "\n";
 			} else {
-				$userpage = $wgUser->getUserPage();
-				foreach( array( 'common', $sk->getSkinName() ) as $name ) {
-					$scriptpage = Title::makeTitleSafe( NS_USER, $userpage->getDBkey() . '/' . $name . '.js' );
-					if ( $scriptpage && $scriptpage->exists() && ( $scriptpage->getLength() > 0 ) ) {
-						$userjs = $scriptpage->getLocalURL( 'action=raw&ctype=' . $wgJsMimeType );
-						$this->addScriptFile( $userjs, $scriptpage->getLatestRevID() );
-					}
-				}
+				$scripts .= $this->makeResourceLoaderLink(
+					$sk, array( 'user', 'user.options' ), 'scripts'
+				);
+				$userOptionsAdded = true;
 			}
 		}
-		$scripts .= "\n" . $this->mScripts;
-		
-		// Add site JS if enabled
-		if ( $wgUseSiteJs ) {
-			$scripts .= self::makeResourceLoaderLink( $sk, 'site', 'scripts' );
+		if ( !$userOptionsAdded ) {
+			$scripts .= $this->makeResourceLoaderLink( $sk, 'user.options', 'scripts' );
 		}
 		
 		return $scripts;
@@ -2418,8 +2436,8 @@ class OutputPage {
 	/**
 	 * @return string HTML tag links to be put in the header.
 	 */
-	public function getHeadLinks( $sk ) {
-		global $wgFeed, $wgRequest;
+	public function getHeadLinks( Skin $sk ) {
+		global $wgFeed;
 
 		// Ideally this should happen earlier, somewhere. :P
 		$this->addDefaultMeta();
@@ -2488,18 +2506,6 @@ class OutputPage {
 				}
 			}
 		}
-
-		// Support individual script requests in debug mode
-		if ( $wgRequest->getBool( 'debug' ) && $wgRequest->getVal( 'debug' ) !== 'false' ) {
-			foreach ( $this->getModuleStyles() as $name ) {
-				$tags[] = self::makeResourceLoaderLink( $sk, $name, 'styles' );
-			}
-		} else {
-			if ( count( $this->getModuleStyles() ) ) {
-				$tags[] = self::makeResourceLoaderLink( $sk, $this->getModuleStyles(), 'styles' );
-			}
-		}
-		
 		return implode( "\n", $tags );
 	}
 
@@ -2550,15 +2556,42 @@ class OutputPage {
 	 * @param $style_css Mixed: inline CSS
 	 */
 	public function addInlineStyle( $style_css ){
-		$this->mScripts .= Html::inlineStyle( $style_css );
+		$this->mInlineStyles .= Html::inlineStyle( $style_css );
 	}
 
 	/**
 	 * Build a set of <link>s for the stylesheets specified in the $this->styles array.
 	 * These will be applied to various media & IE conditionals.
-	 */
-	public function buildCssLinks() {
-		return implode( "\n", $this->buildCssLinksArray() );
+	 * @param $sk Skin object
+	 */
+	public function buildCssLinks( $sk ) {
+		$ret = '';
+		// Add ResourceLoader styles
+		// Split the styles into three groups
+		$styles = array( 'other' => array(), 'user' => array(), 'site' => array() );
+		$resourceLoader = $this->getResourceLoader();
+		foreach ( $this->getModuleStyles() as $name ) {
+			$group = $resourceLoader->getModule( $name )->getGroup();
+			// Modules in groups named "other" or anything different than "user" or "site" will
+			// be placed in the "other" group
+			$styles[isset( $styles[$group] ) ? $group : 'other'][] = $name;
+		}
+
+		// We want site and user styles to override dynamically added styles from modules, but we want
+		// dynamically added styles to override statically added styles from other modules. So the order
+		// has to be other, dynamic, site, user
+		// Add statically added styles for other modules
+		$ret .= $this->makeResourceLoaderLink( $sk, $styles['other'], 'styles' );
+		// Add normal styles added through addStyle()/addInlineStyle() here
+		$ret .= implode( "\n", $this->buildCssLinksArray() ) . $this->mInlineStyles;
+		// Add marker tag to mark the place where the client-side loader should inject dynamic styles
+		// We use a <meta> tag with a made-up name for this because that's valid HTML
+		$ret .= Html::element( 'meta', array( 'name' => 'ResourceLoaderDynamicStyles', 'content' => '' ) );
+		// Add site and user styles
+		$ret .= $this->makeResourceLoaderLink(
+			$sk, array_merge( $styles['site'], $styles['user'] ), 'styles'
+		);
+		return $ret;
 	}
 
 	public function buildCssLinksArray() {
@@ -2589,7 +2622,7 @@ class OutputPage {
 		}
 
 		if( isset( $options['media'] ) ) {
-			$media = $this->transformCssMedia( $options['media'] );
+			$media = self::transformCssMedia( $options['media'] );
 			if( is_null( $media ) ) {
 				return '';
 			}
@@ -2621,7 +2654,7 @@ class OutputPage {
 	 * @param $media String: current value of the "media" attribute
 	 * @return String: modified value of the "media" attribute
 	 */
-	function transformCssMedia( $media ) {
+	public static function transformCssMedia( $media ) {
 		global $wgRequest, $wgHandheldForIPhone;
 
 		// Switch in on-screen display for media testing
@@ -2770,7 +2803,7 @@ class OutputPage {
 	 * @param $modules Array: list of jQuery modules which should be loaded
 	 * @return Array: the list of modules which were not loaded.
 	 * @since 1.16
-	 * @deprecated No longer needed as of 1.17
+	 * @deprecated @since 1.17
 	 */
 	public function includeJQuery( $modules = array() ) {
 		return array();