X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=includes%2Finstaller%2FWebInstallerComplete.php;h=456058e45525da63ef4e67c1103d4b036628b4c3;hb=refs%2Fheads%2FREL1_31;hp=ffab9bb2e79a2b88cd5f766598f788a8e83b0826;hpb=fb7b3eebeb8de47eb42e8d6ccf204106a2d6d9e4;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/installer/WebInstallerComplete.php b/includes/installer/WebInstallerComplete.php
index ffab9bb2e7..456058e455 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( [ '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\n" );
} else {
$this->parent->request->response()->header( "Refresh: 0;url=$lsUrl" );
@@ -37,13 +37,20 @@ 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',
+ wfMessage( $msg,
$lsUrl,
$this->getVar( 'wgServer' ) .
$this->getVar( 'wgScriptPath' ) . '/index.php',
- ''
+ '',
+ $location ?: ''
)->plain(), 'tick-32.png'
)
);