Merge "Fix calls to DatabaseBase static functions"

diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index 4caf902..6dcce23 100644 (file)
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -158,7 +158,7 @@ class PostgresInstaller extends DatabaseInstaller {
        protected function openConnectionWithParams( $user, $password, $dbName, $schema ) {
                $status = Status::newGood();
                try {
-                       $db = Database::factory( 'postgres', array(
+                       $db = DatabaseBase::factory( 'postgres', array(
                                'host' => $this->getVar( 'wgDBserver' ),
                                'user' => $user,
                                'password' => $password,

diff --git a/tests/phpunit/includes/db/DatabaseTestHelper.php b/tests/phpunit/includes/db/DatabaseTestHelper.php
index 39c311f..0c0b390 100644 (file)
--- a/tests/phpunit/includes/db/DatabaseTestHelper.php
+++ b/tests/phpunit/includes/db/DatabaseTestHelper.php
@@ -136,7 +136,7 @@ class DatabaseTestHelper extends DatabaseBase {
                return false;
        }
 
-       function indexInfo( $table, $index, $fname = 'Database::indexInfo' ) {
+       function indexInfo( $table, $index, $fname = 'DatabaseBase::indexInfo' ) {
                return false;
        }