X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FOutputPage.php;h=1da8ac80bc3fc6e840c812015579c34cf0c7b49a;hb=449ad972241f8f53f3d5a9655951740ca1404c86;hp=cb90ccf7b79e82d41cf003a28ae14738bb887355;hpb=28b8d632ad487182c1f65c32dad9e921f80ccd02;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index cb90ccf7b7..1da8ac80bc 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2187,7 +2187,7 @@ class OutputPage extends ContextSource {
 	 * Parse wikitext and return the HTML (internal implementation helper)
 	 *
 	 * @param string $text
-	 * @param Title The title to use
+	 * @param Title $title The title to use
 	 * @param bool $linestart Is this the start of a line?
 	 * @param bool $tidy Whether the output should be tidied
 	 * @param bool $interface Use interface language (instead of content language) while parsing
@@ -2678,10 +2678,6 @@ class OutputPage extends ContextSource {
 		$response->header( 'Content-language: ' .
 			MediaWikiServices::getInstance()->getContentLanguage()->getHtmlCode() );
 
-		if ( !$this->mArticleBodyOnly ) {
-			$sk = $this->getSkin();
-		}
-
 		$linkHeader = $this->getLinkHeader();
 		if ( $linkHeader ) {
 			$response->header( $linkHeader );
@@ -2984,7 +2980,7 @@ class OutputPage extends ContextSource {
 	 */
 	public function showFileRenameError( $old, $new ) {
 		wfDeprecated( __METHOD__, '1.32' );
-		$this->showFatalError( $this->msg( 'filerenameerror', $old, $new )->escpaed() );
+		$this->showFatalError( $this->msg( 'filerenameerror', $old, $new )->escaped() );
 	}
 
 	/**
@@ -3223,7 +3219,10 @@ class OutputPage extends ContextSource {
 		// Use an IE conditional comment to serve the script only to old IE
 		$pieces[] = '<!--[if lt IE 9]>' .
 			ResourceLoaderClientHtml::makeLoad(
-				ResourceLoaderContext::newDummyContext(),
+				new ResourceLoaderContext(
+					$this->getResourceLoader(),
+					new FauxRequest( [] )
+				),
 				[ 'html5shiv' ],
 				ResourceLoaderModule::TYPE_SCRIPTS,
 				[ 'sync' => true ],
@@ -3785,26 +3784,24 @@ class OutputPage extends ContextSource {
 		if ( $config->get( 'EnableCanonicalServerLink' ) ) {
 			if ( $canonicalUrl !== false ) {
 				$canonicalUrl = wfExpandUrl( $canonicalUrl, PROTO_CANONICAL );
-			} else {
-				if ( $this->isArticleRelated() ) {
-					// This affects all requests where "setArticleRelated" is true. This is
-					// typically all requests that show content (query title, curid, oldid, diff),
-					// and all wikipage actions (edit, delete, purge, info, history etc.).
-					// It does not apply to File pages and Special pages.
-					// 'history' and 'info' actions address page metadata rather than the page
-					// content itself, so they may not be canonicalized to the view page url.
-					// TODO: this ought to be better encapsulated in the Action class.
-					$action = Action::getActionName( $this->getContext() );
-					if ( in_array( $action, [ 'history', 'info' ] ) ) {
-						$query = "action={$action}";
-					} else {
-						$query = '';
-					}
-					$canonicalUrl = $this->getTitle()->getCanonicalURL( $query );
+			} elseif ( $this->isArticleRelated() ) {
+				// This affects all requests where "setArticleRelated" is true. This is
+				// typically all requests that show content (query title, curid, oldid, diff),
+				// and all wikipage actions (edit, delete, purge, info, history etc.).
+				// It does not apply to File pages and Special pages.
+				// 'history' and 'info' actions address page metadata rather than the page
+				// content itself, so they may not be canonicalized to the view page url.
+				// TODO: this ought to be better encapsulated in the Action class.
+				$action = Action::getActionName( $this->getContext() );
+				if ( in_array( $action, [ 'history', 'info' ] ) ) {
+					$query = "action={$action}";
 				} else {
-					$reqUrl = $this->getRequest()->getRequestURL();
-					$canonicalUrl = wfExpandUrl( $reqUrl, PROTO_CANONICAL );
+					$query = '';
 				}
+				$canonicalUrl = $this->getTitle()->getCanonicalURL( $query );
+			} else {
+				$reqUrl = $this->getRequest()->getRequestURL();
+				$canonicalUrl = wfExpandUrl( $reqUrl, PROTO_CANONICAL );
 			}
 		}
 		if ( $canonicalUrl !== false ) {
@@ -3948,10 +3945,8 @@ class OutputPage extends ContextSource {
 	 * @return string HTML fragment
 	 */
 	protected function styleLink( $style, array $options ) {
-		if ( isset( $options['dir'] ) ) {
-			if ( $this->getLanguage()->getDir() != $options['dir'] ) {
-				return '';
-			}
+		if ( isset( $options['dir'] ) && $this->getLanguage()->getDir() != $options['dir'] ) {
+			return '';
 		}
 
 		if ( isset( $options['media'] ) ) {