From 958ed916db7085f36cd9a844beff24321e4a1620 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Tue, 11 Jan 2011 13:54:05 +0000 Subject: [PATCH] Fix callback issue noted in r79989 (broken in r78774). $this makes a difference. I'm an idiot. --- includes/installer/CoreInstaller.php | 2 +- includes/installer/PostgresInstaller.php | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/includes/installer/CoreInstaller.php b/includes/installer/CoreInstaller.php index 011890509b..bc72f39d83 100644 --- 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 0c341fbfd6..c562d17408 100644 --- 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; -- 2.20.1