$safedb needs to be set *outside* the if/else block, not just inside the if
authorGreg Sabino Mullane <greg@users.mediawiki.org>
Mon, 21 Mar 2011 21:36:21 +0000 (21:36 +0000)
committerGreg Sabino Mullane <greg@users.mediawiki.org>
Mon, 21 Mar 2011 21:36:21 +0000 (21:36 +0000)
Fixes bug 28170

includes/installer/PostgresInstaller.php

index bf6d8d4..1a3a420 100644 (file)
@@ -224,8 +224,8 @@ class PostgresInstaller extends DatabaseInstaller {
 
                $SQL = "SELECT 1 FROM pg_catalog.pg_database WHERE datname = " . $conn->addQuotes( $dbName );
                $rows = $conn->numRows( $conn->query( $SQL ) );
+               $safedb = $conn->addIdentifierQuotes( $dbName );
                if( !$rows ) {
-                       $safedb = $conn->addIdentifierQuotes( $dbName );
                        $conn->query( "CREATE DATABASE $safedb OWNER $safeuser", __METHOD__ );
                } else {
                        $conn->query( "ALTER DATABASE $safedb OWNER TO $safeuser", __METHOD__ );