X-Git-Url: http://git.cyclocoop.org/%22%20.%20%20%20%24self2%20.%20%20%20%22&var_mode_affiche=boucle?a=blobdiff_plain;f=includes%2FOutputPage.php;h=785641d1a611db9adaa2ce4e85761a97dde4ff09;hb=505e7ee4039c4448e69f2f522830fb2fbf9235c4;hp=52161466a6cc8141b3d47b913abb6007f7512f0e;hpb=b3becd3a6113d0dc03023df2dfeaf403bb6da814;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 52161466a6..785641d1a6 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1596,7 +1596,7 @@ class OutputPage extends ContextSource {
 
 		if ( !$this->mParserOptions ) {
 			if ( !$this->getContext()->getUser()->isSafeToLoad() ) {
-				// $wgUser isn't unstubbable yet, so don't try to get a
+				// $wgUser isn't loaded yet, so don't try to get a
 				// ParserOptions for it. And don't cache this ParserOptions
 				// either.
 				$po = ParserOptions::newFromAnon();
@@ -1852,7 +1852,7 @@ class OutputPage extends ContextSource {
 		// Avoid PHP 7.1 warning of passing $this by reference
 		$outputPage = $this;
 		Hooks::run( 'LanguageLinks', [ $this->getTitle(), &$this->mLanguageLinks, &$linkFlags ] );
-		Hooks::run( 'OutputPageParserOutput', [ &$outputPage, $parserOutput ] );
+		Hooks::runWithoutAbort( 'OutputPageParserOutput', [ &$outputPage, $parserOutput ] );
 
 		// This check must be after 'OutputPageParserOutput' runs in addParserOutputMetadata
 		// so that extensions may modify ParserOutput to toggle TOC.
@@ -1890,7 +1890,7 @@ class OutputPage extends ContextSource {
 		$text = $parserOutput->getText();
 		// Avoid PHP 7.1 warning of passing $this by reference
 		$outputPage = $this;
-		Hooks::run( 'OutputPageBeforeHTML', [ &$outputPage, &$text ] );
+		Hooks::runWithoutAbort( 'OutputPageBeforeHTML', [ &$outputPage, &$text ] );
 		$this->addHTML( $text );
 	}
 
@@ -2436,7 +2436,7 @@ class OutputPage extends ContextSource {
 			$outputPage = $this;
 			// Hook that allows last minute changes to the output page, e.g.
 			// adding of CSS or Javascript by extensions.
-			Hooks::run( 'BeforePageDisplay', [ &$outputPage, &$sk ] );
+			Hooks::runWithoutAbort( 'BeforePageDisplay', [ &$outputPage, &$sk ] );
 
 			try {
 				$sk->outputPage();
@@ -2448,7 +2448,7 @@ class OutputPage extends ContextSource {
 
 		try {
 			// This hook allows last minute changes to final overall output by modifying output buffer
-			Hooks::run( 'AfterFinalPageOutput', [ $this ] );
+			Hooks::runWithoutAbort( 'AfterFinalPageOutput', [ $this ] );
 		} catch ( Exception $e ) {
 			ob_end_clean(); // bug T129657
 			throw $e;
@@ -2923,15 +2923,14 @@ class OutputPage extends ContextSource {
 		$pieces = array_merge( $pieces, array_values( $this->getHeadLinksArray() ) );
 		$pieces = array_merge( $pieces, array_values( $this->mHeadItems ) );
 
-		$min = ResourceLoader::inDebugMode() ? '' : '.min';
 		// Use an IE conditional comment to serve the script only to old IE
 		$pieces[] = '<!--[if lt IE 9]>' .
-			Html::element( 'script', [
-				'src' => self::transformResourcePath(
-					$this->getConfig(),
-					"/resources/lib/html5shiv/html5shiv{$min}.js"
-				),
-			] ) .
+			ResourceLoaderClientHtml::makeLoad(
+				ResourceLoaderContext::newDummyContext(),
+				[ 'html5shiv' ],
+				ResourceLoaderModule::TYPE_SCRIPTS,
+				[ 'sync' => true ]
+			) .
 			'<![endif]-->';
 
 		$pieces[] = Html::closeElement( 'head' );