X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22calendrier%22%2C%22type=semaine%22%29%20.%20%22?a=blobdiff_plain;f=includes%2Finstaller%2FWebInstallerOutput.php;h=f8dc8ee57fcdd7b9779cc1289c1962583bb2b4ca;hb=fc1d4d79602415d1362de9286b0729bd86d03fc1;hp=211bad1e0b5ed4016cd8497a23b56fcc05f56daf;hpb=3de7e73bd0f0ddf5d7c38fd46edfae96d1a64e40;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index 211bad1e0b..f8dc8ee57f 100644
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -115,7 +115,10 @@ class WebInstallerOutput {
 
 	public function output() {
 		$this->flush();
-		$this->outputFooter();
+
+		if ( !$this->redirectTarget ) {
+			$this->outputFooter();
+		}
 	}
 
 	/**
@@ -126,12 +129,12 @@ class WebInstallerOutput {
 	public function getCSS() {
 		global $wgStyleDirectory;
 
-		$moduleNames = array(
+		$moduleNames = [
 			// See SkinTemplate::setupSkinUserCss
 			'mediawiki.legacy.shared',
 			// See Vector::setupSkinUserCss
 			'mediawiki.skinning.interface',
-		);
+		];
 
 		$resourceLoader = new ResourceLoader();
 
@@ -139,9 +142,9 @@ class WebInstallerOutput {
 			// Force loading Vector skin if available as a fallback skin
 			// for whatever ResourceLoader wants to have as the default.
 			$registry = new ExtensionRegistry();
-			$data = $registry->readFromQueue( array(
+			$data = $registry->readFromQueue( [
 				"$wgStyleDirectory/Vector/skin.json" => 1,
-			) );
+			] );
 			if ( isset( $data['globals']['wgResourceModules'] ) ) {
 				$resourceLoader->register( $data['globals']['wgResourceModules'] );
 			}
@@ -151,13 +154,13 @@ class WebInstallerOutput {
 
 		$moduleNames[] = 'mediawiki.legacy.config';
 
-		$rlContext = new ResourceLoaderContext( $resourceLoader, new FauxRequest( array(
+		$rlContext = new ResourceLoaderContext( $resourceLoader, new FauxRequest( [
 				'debug' => 'true',
 				'lang' => $this->getLanguageCode(),
 				'only' => 'styles',
-		) ) );
+		] ) );
 
-		$styles = array();
+		$styles = [];
 		foreach ( $moduleNames as $moduleName ) {
 			/** @var ResourceLoaderFileModule $module */
 			$module = $resourceLoader->getModule( $moduleName );
@@ -228,10 +231,10 @@ class WebInstallerOutput {
 	 * @return string[]
 	 */
 	public function getHeadAttribs() {
-		return array(
+		return [
 			'dir' => $this->getDir(),
 			'lang' => wfBCP47( $this->getLanguageCode() ),
-		);
+		];
 	}
 
 	/**
@@ -273,7 +276,7 @@ class WebInstallerOutput {
 	<?php echo Html::linkedScript( 'config.js' ) . "\n"; ?>
 </head>
 
-<?php echo Html::openElement( 'body', array( 'class' => $this->getDir() ) ) . "\n"; ?>
+<?php echo Html::openElement( 'body', [ 'class' => $this->getDir() ] ) . "\n"; ?>
 <div id="mw-page-base"></div>
 <div id="mw-head-base"></div>
 <div id="content" class="mw-body">