http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88201
Revision: 88201
Author: demon
Date: 2011-05-15 20:30:19 +0000 (Sun, 15 May 2011)
Log Message:
-----------
MFT r87512
Modified Paths:
--------------
branches/REL1_17/phase3/includes/installer/MysqlInstaller.php
Property Changed:
----------------
branches/REL1_17/phase3/includes/installer/MysqlInstaller.php
Modified: branches/REL1_17/phase3/includes/installer/MysqlInstaller.php
===================================================================
--- branches/REL1_17/phase3/includes/installer/MysqlInstaller.php
2011-05-15 19:54:41 UTC (rev 88200)
+++ branches/REL1_17/phase3/includes/installer/MysqlInstaller.php
2011-05-15 20:30:19 UTC (rev 88201)
@@ -419,6 +419,10 @@
}
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 @@
$dbName = $this->getVar( 'wgDBname' );
$this->db->selectDB( $dbName );
$server = $this->getVar( 'wgDBserver' );
- $dbUser = $this->getVar( 'wgDBuser' );
$password = $this->getVar( 'wgDBpassword' );
$grantableNames = array();
Property changes on:
branches/REL1_17/phase3/includes/installer/MysqlInstaller.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/includes/installer/MysqlInstaller.php:51646
/branches/new-installer/phase3/includes/installer/MysqlInstaller.php:43664-66004
/branches/sqlite/includes/installer/MysqlInstaller.php:58211-58321
/branches/wmf-deployment/includes/installer/MysqlInstaller.php:53381
/trunk/phase3/includes/installer/MysqlInstaller.php:82845,82847-82848,84875,84881-84882,84970,84976,85021,85066,87512
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
