From 1866fa13813dd7a2e05173d2048c2a10d44ad466 Mon Sep 17 00:00:00 2001
From: "Mark A. Hershberger" <mah@users.mediawiki.org>
Date: Fri, 10 Jun 2011 18:48:16 +0000
Subject: [PATCH] =?utf8?q?Make=20Pg=20installer=20work=20in=20the=20?=
 =?utf8?q?=E2=80=9Ccommon=E2=80=9D=20case:=20follow=20up=20r89821=20so=20t?=
 =?utf8?q?hat=20$exists=20can=20be=20set=20true=20if=20same=20user=20is=20?=
 =?utf8?q?the=20same=20for=20install=20and=20web.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 includes/installer/PostgresInstaller.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index 501f673fef..a47c172d85 100644
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -276,15 +276,13 @@ class PostgresInstaller extends DatabaseInstaller {
 
 		$same = $this->getVar( 'wgDBuser' ) === $this->getVar( '_InstallUser' );
 
-		if ( !$same ) {
-			// Check if the web user exists
-			// Connect to the database with the install user
-			$status = $this->getPgConnection( 'create-db' );
-			if ( !$status->isOK() ) {
-				return $status;
-			}
-			$exists = $status->value->roleExists( $this->getVar( 'wgDBuser' ) );
+		// Check if the web user exists
+		// Connect to the database with the install user
+		$status = $this->getPgConnection( 'create-db' );
+		if ( !$status->isOK() ) {
+			return $status;
 		}
+		$exists = $status->value->roleExists( $this->getVar( 'wgDBuser' ) );
 
 		// Validate the create checkbox
 		if ( $this->canCreateAccounts() && !$same && !$exists ) {
-- 
2.20.1