diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:31:04 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:58:39 +0200 |
commit | f6d65e533c62f6deb21342d4901ece24497b433e (patch) | |
tree | f28adf0362d14bcd448f7b65a7aaf38650f923aa /includes/installer/PostgresInstaller.php | |
parent | c27b2e832fe25651ef2410fae85b41072aae7519 (diff) |
Update to MediaWiki 1.25.1
Diffstat (limited to 'includes/installer/PostgresInstaller.php')
-rw-r--r-- | includes/installer/PostgresInstaller.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php index c30a989e..b18fe944 100644 --- a/includes/installer/PostgresInstaller.php +++ b/includes/installer/PostgresInstaller.php @@ -262,11 +262,13 @@ class PostgresInstaller extends DatabaseInstaller { $status = Status::newGood(); foreach ( $dbs as $db ) { try { - $conn = new DatabasePostgres( - $this->getVar( 'wgDBserver' ), - $user, - $password, - $db ); + $p = array( + 'host' => $this->getVar( 'wgDBserver' ), + 'user' => $user, + 'password' => $password, + 'dbname' => $db + ); + $conn = DatabaseBase::factory( 'postgres', $p ); } catch ( DBConnectionError $error ) { $conn = false; $status->fatal( 'config-pg-test-error', $db, @@ -627,9 +629,9 @@ class PostgresInstaller extends DatabaseInstaller { public function getGlobalDefaults() { // The default $wgDBmwschema is null, which breaks Postgres and other DBMSes that require // the use of a schema, so we need to set it here - return array( + return array_merge( parent::getGlobalDefaults(), array( 'wgDBmwschema' => 'mediawiki', - ); + ) ); } public function setupPLpgSQL() { |