| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -119,7 +119,8 @@ |
| 120 | 120 | } else { |
| 121 | 121 | $key = $r->getText( 'config_wpUpgradeKey' ); |
| 122 | 122 | if( !$key || $key !== $this->getVar( '_UpgradeKey' ) ) { |
| 123 | | - $this->display( true ); |
| | 123 | + $this->parent->showError( 'config-localsettings-badkey' ); |
| | 124 | + $this->display(); |
| 124 | 125 | return 'output'; |
| 125 | 126 | } else { |
| 126 | 127 | $this->setVar( '_LocalSettingsLocked', false ); |
| — | — | @@ -130,23 +131,17 @@ |
| 131 | 132 | |
| 132 | 133 | /** |
| 133 | 134 | * Display stuff to the end user |
| 134 | | - * @param $badKey bool Whether the key input by the user was bad |
| 135 | 135 | */ |
| 136 | | - private function display( $badKey = false ) { |
| | 136 | + private function display() { |
| 137 | 137 | $this->startForm(); |
| | 138 | + $this->parent->showStatusBox( $this->status ); |
| 138 | 139 | if( $this->status->isOK() && !$this->status->isGood() ) { |
| 139 | | - if( $badKey ) { |
| 140 | | - $this->parent->showError( 'config-localsettings-badkey' ); |
| 141 | | - } |
| 142 | | - $this->parent->output->addWikiText( wfMsg( 'config-localsettings-upgrade' ) ); |
| 143 | 140 | $this->addHTML( "<br />" . |
| 144 | 141 | $this->parent->getTextBox( array( |
| 145 | 142 | 'var' => 'wpUpgradeKey', |
| 146 | 143 | 'label' => 'config-localsettings-key', |
| 147 | 144 | ) ) |
| 148 | 145 | ); |
| 149 | | - } else { |
| 150 | | - $this->parent->showStatusBox( $this->status ); |
| 151 | 146 | } |
| 152 | 147 | $this->endForm(); |
| 153 | 148 | } |