| Index: branches/new-installer/phase3/maintenance/language/messages.inc |
| — | — | @@ -3355,8 +3355,6 @@ |
| 3356 | 3356 | 'config-install-user', |
| 3357 | 3357 | 'config-install-localsettings', |
| 3358 | 3358 | 'config-install-done', |
| 3359 | | - 'config-install-failed', |
| 3360 | | - 'config-upgrade-done', |
| 3361 | 3359 | ), |
| 3362 | 3360 | ); |
| 3363 | 3361 | |
| Index: branches/new-installer/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -1531,8 +1531,6 @@ |
| 1532 | 1532 | $localSettings->writeLocalSettings(); |
| 1533 | 1533 | $this->endStage(); |
| 1534 | 1534 | |
| 1535 | | - $this->parent->setVar( '_InstallStatus', 'installed' ); |
| 1536 | | - |
| 1537 | 1535 | $this->endForm(); |
| 1538 | 1536 | } |
| 1539 | 1537 | |
| — | — | @@ -1546,18 +1544,16 @@ |
| 1547 | 1545 | } |
| 1548 | 1546 | class WebInstaller_Complete extends WebInstallerPage { |
| 1549 | 1547 | public function execute() { |
| 1550 | | - $status = $this->parent->getVar( '_InstallStatus' ); |
| 1551 | 1548 | $this->startForm(); |
| 1552 | | - if( $status === 'installed' ) { |
| 1553 | | - $msg = 'config-install-done'; |
| 1554 | | - } elseif( $status === 'upgraded' ) { |
| 1555 | | - $msg = 'config-upgrade-done'; |
| 1556 | | - } else { |
| 1557 | | - $msg = 'config-install-failed'; |
| 1558 | | - } |
| 1559 | | - global $wgServer; |
| 1560 | | - $url = $wgServer . preg_replace( "/config\/[a-z\-]+\.php5?/i", '', $this->parent->getUrl() ); |
| 1561 | | - $this->parent->output->addWikiText( wfMsg( $msg, $url ) ); |
| | 1549 | + $this->parent->output->addHTML( |
| | 1550 | + $this->parent->getInfoBox( |
| | 1551 | + wfMsgNoTrans( 'config-install-done', |
| | 1552 | + $GLOBALS['wgServer'] . |
| | 1553 | + $this->getVar( 'wgScriptPath' ) . '/index' . |
| | 1554 | + $this->getVar( 'wgScriptExtension' ) |
| | 1555 | + ), 'tick-32.png' |
| | 1556 | + ) |
| | 1557 | + ); |
| 1562 | 1558 | $this->endForm( false ); |
| 1563 | 1559 | } |
| 1564 | 1560 | } |
| Index: branches/new-installer/phase3/includes/installer/Installer.php |
| — | — | @@ -70,7 +70,6 @@ |
| 71 | 71 | '_CCDone' => false, |
| 72 | 72 | '_Extensions' => array(), |
| 73 | 73 | '_MemCachedServers' => '', |
| 74 | | - '_InstallStatus' => false, |
| 75 | 74 | ); |
| 76 | 75 | |
| 77 | 76 | /** |
| Index: branches/new-installer/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4462,14 +4462,7 @@ |
| 4463 | 4463 | for MediaWiki to begin working. |
| 4464 | 4464 | |
| 4465 | 4465 | [$1 Link to your wiki]", |
| 4466 | | -'config-install-failed' => "'''Sorry''', something in the installation process seems to have gone horribly wrong.", |
| 4467 | | -'config-upgrade-done' => "'''Congratulations''', you have successfully upgraded MediaWiki. |
| 4468 | 4466 | |
| 4469 | | -If you chose to overwrite your LocalSettings.php file, you will need to move it from <tt>./config/LocalSettings.php</tt> |
| 4470 | | -to <tt>./LocalSettings.php</tt>. |
| 4471 | | - |
| 4472 | | -[$1 Link to your wiki]", |
| 4473 | | - |
| 4474 | 4467 | # Special:Version |
| 4475 | 4468 | 'version' => 'Version', |
| 4476 | 4469 | 'version-extensions' => 'Installed extensions', |