r64260 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r64259‎ | r64260 | r64261 >
Date:15:53, 27 March 2010
Author:maxsem
Status:ok
Tags:
Comment:
Differentiate the install complete depending on whether LocalSettings.php has been moved
Modified paths:
  • /branches/new-installer/phase3/includes/installer/WebInstaller.php (modified) (history)
  • /branches/new-installer/phase3/languages/messages/MessagesEn.php (modified) (history)
  • /branches/new-installer/phase3/maintenance/language/messages.inc (modified) (history)

Diff [purge]

Index: branches/new-installer/phase3/maintenance/language/messages.inc
@@ -3361,6 +3361,7 @@
33623362 'config-install-sysop',
33633363 'config-install-localsettings',
33643364 'config-install-done',
 3365+ 'config-install-done-moved',
33653366 ),
33663367 );
33673368
Index: branches/new-installer/phase3/includes/installer/WebInstaller.php
@@ -1524,10 +1524,12 @@
15251525 }
15261526 class WebInstaller_Complete extends WebInstallerPage {
15271527 public function execute() {
 1528+ global $IP;
15281529 $this->startForm();
1529 - $this->parent->output->addHTML(
 1530+ $msg = file_exists( "$IP/LocalSettings.php" ) ? 'config-install-done-moved' : 'config-install-done';
 1531+ $this->parent->output->addHTML(
15301532 $this->parent->getInfoBox(
1531 - wfMsgNoTrans( 'config-install-done',
 1533+ wfMsgNoTrans( $msg,
15321534 $GLOBALS['wgServer'] .
15331535 $this->getVar( 'wgScriptPath' ) . '/index' .
15341536 $this->getVar( 'wgScriptExtension' )
Index: branches/new-installer/phase3/languages/messages/MessagesEn.php
@@ -4465,7 +4465,10 @@
44664466 for MediaWiki to begin working.
44674467
44684468 [$1 Link to your wiki]",
 4469+'config-install-done-moved' => "'''Congratulations''', you have successfully installed MediaWiki.
44694470
 4471+[$1 Link to your wiki]",
 4472+
44704473 # Special:Version
44714474 'version' => 'Version',
44724475 'version-extensions' => 'Installed extensions',

Status & tagging log