X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FOutputPage.php;h=de50c060bd7b944f7a08f5e1b89a5dd91d3b5d29;hb=9cb3299aee7acc5ba824427146e9f4c77e325ede;hp=1baf8e248e21319f346249c2c10d6132fd34f7fa;hpb=51e3fb9a716f3ccd3b114109e5a5045a09864ff0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 1baf8e248e..de50c060bd 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -563,11 +563,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 ) ) );
 	}
@@ -1430,7 +1425,17 @@ 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 );
@@ -1612,8 +1617,7 @@ class OutputPage {
 		$sk = $wgUser->getSkin();
 
 		// Add base resources
-		$this->addModules( array( 'mediawiki.legacy.wikibits' ) );
-		$this->addModules( array( 'mediawiki.util' ) );
+		$this->addModules( array( 'mediawiki.legacy.wikibits', 'mediawiki.util' ) );
 
 		// Add various resources if required
 		if ( $wgUseAjax ) {
@@ -1622,7 +1626,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 ) ) {
@@ -1631,7 +1635,7 @@ class OutputPage {
 		}
 
 		if( $wgUser->getBoolOption( 'editsectiononrightclick' ) ) {
-			$this->addModules( 'mediawiki.legacy.rightclickedit' );
+			$this->addModules( 'mediawiki.action.view.rightClickEdit' );
 		}
 
 		if( $wgUniversalEditButton ) {
@@ -1697,21 +1701,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.
 	 *
@@ -1813,9 +1802,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();
 	}
@@ -1900,7 +1887,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(
@@ -2046,7 +2033,6 @@ class OutputPage {
 	 * @return none
 	 */
 	public function addPasswordSecurity( $passwordId, $retypeId ) {
-		$this->includeJQuery();
 		$data = array(
 			'password' => '#' . $passwordId,
 			'retype' => '#' . $retypeId,
@@ -2227,8 +2213,8 @@ class OutputPage {
 		$ret .= Html::element( 'title', null, $this->getHTMLTitle() ) . "\n";
 
 		$ret .= implode( "\n", array(
-			$this->getHeadLinks( $sk ),
-			$this->buildCssLinks(),
+			$this->getHeadLinks(),
+			$this->buildCssLinks( $sk ),
 			$this->getHeadItems(),
 		) );
 		if ( $sk->usercss ) {
@@ -2285,30 +2271,62 @@ class OutputPage {
 		return $ret;
 	}
 
-	// TODO: Document
-	protected function makeResourceLoaderLink( $skin, $modules, $only, $useESI = false ) {
-		global $wgUser, $wgLang, $wgRequest, $wgLoadScript, $wgResourceLoaderDebug, $wgResourceLoaderUseESI,
-			$wgResourceLoaderInlinePrivateModules;
-		// Lazy-load ResourceLoader
+	/**
+	 * 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;
+		// 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(
 			'lang' => $wgLang->getCode(),
-			'debug' => $wgRequest->getFuzzyBool( 'debug', $wgResourceLoaderDebug ) ? 'true' : 'false',
-			'skin' => $wgUser->getSkin()->getSkinName(),
+			'debug' => ResourceLoader::inDebugMode() ? 'true' : 'false',
+			'skin' => $skin->getSkinName(),
 			'only' => $only,
 		);
-		// Remove duplicate module requests
-		$modules = array_unique( (array) $modules );
-		// Sort module names so requests are more uniform
-		sort( $modules );
+		
+		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 = $this->mResourceLoader->getModule( $name );
+			$module = $resourceLoader->getModule( $name );
 			$group = $module->getGroup();
 			if ( !isset( $groups[$group] ) ) {
 				$groups[$group] = array();
@@ -2324,26 +2342,27 @@ class OutputPage {
 			}
 			// Support inlining of private modules if configured as such
 			if ( $group === 'private' && $wgResourceLoaderInlinePrivateModules ) {
-				$context = new ResourceLoaderContext( $this->mResourceLoader, new FauxRequest( $query ) );
+				$context = new ResourceLoaderContext( $resourceLoader, new FauxRequest( $query ) );
 				if ( $only == 'styles' ) {
 					$links .= Html::inlineStyle(
-						$this->mResourceLoader->makeModuleResponse( $context, $modules )
+						$resourceLoader->makeModuleResponse( $context, $modules )
 					);
 				} else {
 					$links .= Html::inlineScript(
 						ResourceLoader::makeLoaderConditionalScript(
-							$this->mResourceLoader->makeModuleResponse( $context, $modules )
+							$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
+			// 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( $this->mResourceLoader, new FauxRequest( $query ) );
+				// 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 ) {
@@ -2384,66 +2403,55 @@ class OutputPage {
 	 * @return String: HTML fragment
 	 */
 	function getHeadScripts( Skin $sk ) {
-		global $wgUser, $wgRequest, $wgUseSiteJs, $wgResourceLoaderDebug;
+		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...
+		// 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->getFuzzyBool( 'debug', $wgResourceLoaderDebug ) ) {
-			// Scripts
-			foreach ( $this->getModuleScripts() as $name ) {
-				$scripts .= $this->makeResourceLoaderLink( $sk, $name, 'scripts' );
-			}
-			// Messages
-			foreach ( $this->getModuleMessages() as $name ) {
-				$scripts .= $this->makeResourceLoaderLink( $sk, $name, 'messages' );
-			}
-		} else {
-			// Scripts
-			if ( count( $this->getModuleScripts() ) ) {
-				$scripts .= $this->makeResourceLoaderLink( $sk, $this->getModuleScripts(), 'scripts' );
-			}
-			// Messages
-			if ( count( $this->getModuleMessages() ) ) {
-				$scripts .= $this->makeResourceLoaderLink( $sk, $this->getModuleMessages(), 'messages' );
-			}
-		}
+		// Script and Messages "only" requests
+		$scripts .= $this->makeResourceLoaderLink( $sk, $this->getModuleScripts(), 'scripts' );
+		$scripts .= $this->makeResourceLoaderLink( $sk, $this->getModuleMessages(), 'messages' );
 
-		// Modules - let the client calculate dependencies and batch requests as it likes
+		// 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 ( window.mediaWiki ) { mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go(); }"
+				ResourceLoader::makeLoaderConditionalScript(
+					Xml::encodeJsCall( 'mediaWiki.loader.load', array( $this->getModules() ) ) .
+					Xml::encodeJsCall( 'mediaWiki.loader.go', array() )
+				)
 			) . "\n";
 		}
 
+		// 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 {
-				$scripts .= $this->makeResourceLoaderLink( $sk, array( 'user', 'user.options' ), 'scripts' );
+				$scripts .= $this->makeResourceLoaderLink(
+					$sk, array( 'user', 'user.options' ), 'scripts'
+				);
 				$userOptionsAdded = true;
 			}
 		}
 		if ( !$userOptionsAdded ) {
 			$scripts .= $this->makeResourceLoaderLink( $sk, 'user.options', 'scripts' );
 		}
-		$scripts .= "\n" . $this->mScripts;
-
-		// Add site JS if enabled
-		if ( $wgUseSiteJs ) {
-			$scripts .= $this->makeResourceLoaderLink( $sk, 'site', 'scripts' );
-		}
-
+		
 		return $scripts;
 	}
 
@@ -2491,8 +2499,8 @@ class OutputPage {
 	/**
 	 * @return string HTML tag links to be put in the header.
 	 */
-	public function getHeadLinks( $sk ) {
-		global $wgFeed, $wgRequest, $wgResourceLoaderDebug;
+	public function getHeadLinks() {
+		global $wgFeed;
 
 		// Ideally this should happen earlier, somewhere. :P
 		$this->addDefaultMeta();
@@ -2562,17 +2570,6 @@ class OutputPage {
 			}
 		}
 
-		// Support individual script requests in debug mode
-		if ( $wgRequest->getFuzzyBool( 'debug', $wgResourceLoaderDebug ) ) {
-			foreach ( $this->getModuleStyles() as $name ) {
-				$tags[] = $this->makeResourceLoaderLink( $sk, $name, 'styles' );
-			}
-		} else {
-			if ( count( $this->getModuleStyles() ) ) {
-				$tags[] = $this->makeResourceLoaderLink( $sk, $this->getModuleStyles(), 'styles' );
-			}
-		}
-
 		return implode( "\n", $tags );
 	}
 
@@ -2630,8 +2627,23 @@ class OutputPage {
 	 * 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() );
+	public function buildCssLinks( $sk ) {
+		// 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( $style[$group] ) ? $group : 'other'][] = $name;
+		}
+		// Add tags created using legacy methods
+		$tags = $this->buildCssLinksArray();
+		// Add ResourceLoader module style tags
+		$tags[] = $this->makeResourceLoaderLink(
+			$sk, array_merge( $styles['other'], $styles['site'], $styles['user'] ), 'styles'
+		);
+		return implode( "\n", $tags );
 	}
 
 	public function buildCssLinksArray() {