From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Fri, 10 Jun 2011 18:48:16 +0000 (+0000)
Subject: Make Pg installer work in the “common” case: follow up r89821 so that $exists can... 
X-Git-Tag: 1.31.0-rc.0~29590
X-Git-Url: http://git.cyclocoop.org/clavettes/images/siteon3.jpg?a=commitdiff_plain;h=1866fa13813dd7a2e05173d2048c2a10d44ad466;p=lhc%2Fweb%2Fwiklou.git

Make Pg installer work in the “common” case: follow up r89821 so that $exists can be set true if same user is the same for install and web.
---

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 ) {