http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84490

Revision: 84490
Author:   greg
Date:     2011-03-21 21:36:21 +0000 (Mon, 21 Mar 2011)
Log Message:
-----------
$safedb needs to be set *outside* the if/else block, not just inside the if
Fixes bug 28170

Modified Paths:
--------------
    trunk/phase3/includes/installer/PostgresInstaller.php

Modified: trunk/phase3/includes/installer/PostgresInstaller.php
===================================================================
--- trunk/phase3/includes/installer/PostgresInstaller.php       2011-03-21 
21:26:16 UTC (rev 84489)
+++ trunk/phase3/includes/installer/PostgresInstaller.php       2011-03-21 
21:36:21 UTC (rev 84490)
@@ -224,8 +224,8 @@
 
                $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__ );


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to