| Index: trunk/phase3/includes/installer/CoreInstaller.php |
| — | — | @@ -354,7 +354,7 @@ |
| 355 | 355 | foreach( $this->extraInstallSteps as $step ) { |
| 356 | 356 | // Put the step at the beginning |
| 357 | 357 | if( !strval( $step['position' ] ) ) { |
| 358 | | - array_unshift( $installSteps, $step['callback'] ); |
| | 358 | + array_unshift( $this->installSteps, $step['callback'] ); |
| 359 | 359 | continue; |
| 360 | 360 | } else { |
| 361 | 361 | // Walk the $coreInstallSteps array to see if we can modify |
| Index: trunk/phase3/includes/installer/PostgresInstaller.php |
| — | — | @@ -193,25 +193,20 @@ |
| 194 | 194 | 'name' => 'pg-commit', |
| 195 | 195 | 'callback' => array( $this, 'commitChanges' ), |
| 196 | 196 | ); |
| 197 | | -/* $userCB = array( |
| | 197 | + $userCB = array( |
| 198 | 198 | 'name' => 'user', |
| 199 | 199 | 'callback' => array( $this, 'setupUser' ), |
| 200 | | - ); */ |
| | 200 | + ); |
| 201 | 201 | $ts2CB = array( |
| 202 | 202 | 'name' => 'pg-ts2', |
| 203 | 203 | 'callback' => array( $this, 'setupTs2' ), |
| 204 | 204 | ); |
| 205 | 205 | $this->parent->addInstallStep( $commitCB, 'interwiki' ); |
| 206 | | -// $this->parent->addInstallStep( $userCB ); |
| | 206 | + $this->parent->addInstallStep( $userCB ); |
| 207 | 207 | $this->parent->addInstallStep( $ts2CB, 'setupDatabase' ); |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | function setupDatabase() { |
| 211 | | - $status = $this->setupUser(); |
| 212 | | - if (!$status->isOK() ) { |
| 213 | | - return $status; |
| 214 | | - } |
| 215 | | - |
| 216 | 211 | $status = $this->getConnection(); |
| 217 | 212 | if ( !$status->isOK() ) { |
| 218 | 213 | return $status; |