Fix callback issue noted in r79989 (broken in r78774).

$this makes a difference.
I'm an idiot.

diff --git a/includes/installer/CoreInstaller.php b/includes/installer/CoreInstaller.php
index 0118905..bc72f39 100644 (file)
--- a/includes/installer/CoreInstaller.php
+++ b/includes/installer/CoreInstaller.php
@@ -354,7 +354,7 @@ abstract class CoreInstaller extends Installer {
                foreach( $this->extraInstallSteps as $step ) {
                        // Put the step at the beginning
                        if( !strval( $step['position' ] ) ) {
-                               array_unshift( $installSteps, $step['callback'] );
+                               array_unshift( $this->installSteps, $step['callback'] );
                                continue;
                        } else {
                                // Walk the $coreInstallSteps array to see if we can modify

diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index 0c341fb..c562d17 100644 (file)
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -193,25 +193,20 @@ class PostgresInstaller extends DatabaseInstaller {
                        'name' => 'pg-commit',
                        'callback' => array( $this, 'commitChanges' ),
                );
-/*             $userCB = array(
+               $userCB = array(
                        'name' => 'user',
                        'callback' => array( $this, 'setupUser' ),
-               ); */
+               );
                $ts2CB = array(
                        'name' => 'pg-ts2',
                        'callback' => array( $this, 'setupTs2' ),
                );
                $this->parent->addInstallStep( $commitCB, 'interwiki' );
-//             $this->parent->addInstallStep( $userCB );
+               $this->parent->addInstallStep( $userCB );
                $this->parent->addInstallStep( $ts2CB, 'setupDatabase' );
        }
 
        function setupDatabase() {
-               $status = $this->setupUser();
-               if (!$status->isOK() ) {
-                       return $status;
-               }
-
                $status = $this->getConnection();
                if ( !$status->isOK() ) {
                        return $status;