Fix for r87278: if we're installing with the same user we're going to use, skip creat...

diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index 467f0e7..5046df3 100644 (file)
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -419,6 +419,10 @@ class MysqlInstaller extends DatabaseInstaller {
        }
 
        public function setupUser() {
+               $dbUser = $this->getVar( 'wgDBuser' );
+               if( $dbUser == $this->getVar( '_InstallUser' ) ) {
+                       return Status::newGood();
+               }
                $status = $this->getConnection();
                if ( !$status->isOK() ) {
                        return $status;
@@ -428,7 +432,6 @@ class MysqlInstaller extends DatabaseInstaller {
                $dbName = $this->getVar( 'wgDBname' );
                $this->db->selectDB( $dbName );
                $server = $this->getVar( 'wgDBserver' );
-               $dbUser = $this->getVar( 'wgDBuser' );
                $password = $this->getVar( 'wgDBpassword' );
                $grantableNames = array();