X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FWebInstallerComplete.php;h=2512efa7e379829f92ebc7fd2e07fa90342eae8a;hb=923855c0c558d3025be522bd3f9cd6660757308f;hp=f443db4c874c67990869599df0fb83cc7f0c3b60;hpb=3c18e32e58d53ab38d1dd52d00f248ddef435ebd;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/WebInstallerComplete.php b/includes/installer/WebInstallerComplete.php
index f443db4c87..2512efa7e3 100644
--- a/includes/installer/WebInstallerComplete.php
+++ b/includes/installer/WebInstallerComplete.php
@@ -24,12 +24,12 @@ class WebInstallerComplete extends WebInstallerPage {
 	public function execute() {
 		// Pop up a dialog box, to make it difficult for the user to forget
 		// to download the file
-		$lsUrl = $this->getVar( 'wgServer' ) . $this->parent->getURL( array( 'localsettings' => 1 ) );
+		$lsUrl = $this->getVar( 'wgServer' ) . $this->parent->getUrl( [ 'localsettings' => 1 ] );
 		if ( isset( $_SERVER['HTTP_USER_AGENT'] ) &&
 			strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false
 		) {
 			// JS appears to be the only method that works consistently with IE7+
-			$this->addHtml( "\n<script>jQuery( function () { location.href = " .
+			$this->addHTML( "\n<script>jQuery( function () { location.href = " .
 				Xml::encodeJsVar( $lsUrl ) . "; } );</script>\n" );
 		} else {
 			$this->parent->request->response()->header( "Refresh: 0;url=$lsUrl" );
@@ -37,21 +37,29 @@ class WebInstallerComplete extends WebInstallerPage {
 
 		$this->startForm();
 		$this->parent->disableLinkPopups();
+		$location = $this->parent->getLocalSettingsLocation();
+		$msg = 'config-install-done';
+		if ( $location !== false ) {
+			// config-install-done-path
+			$msg .= '-path';
+		}
 		$this->addHTML(
 			$this->parent->getInfoBox(
-				wfMessage( 'config-install-done',
+				new HtmlArmor( wfMessage( $msg,
 					$lsUrl,
 					$this->getVar( 'wgServer' ) .
-					$this->getVar( 'wgScriptPath' ) . '/index.php',
-					'<downloadlink/>'
-				)->plain(), 'tick-32.png'
+						$this->getVar( 'wgScriptPath' ) . '/index.php',
+					Message::rawParam( $this->parent->makeDownloadLinkHtml() ),
+					$location ?: ''
+				)->parse() ), 'tick-32.png'
 			)
 		);
 		$this->addHTML( $this->parent->getInfoBox(
-			wfMessage( 'config-extension-link' )->text() ) );
+			wfMessage( 'config-extension-link' )->plain() ) );
 
 		$this->parent->restoreLinkPopups();
 		$this->endForm( false, false );
+		return '';
 	}
 
 }