diff options
| author | Jure Kajzer <freakolowsky@users.mediawiki.org> | 2010-10-27 14:52:18 +0000 |
|---|---|---|
| committer | Jure Kajzer <freakolowsky@users.mediawiki.org> | 2010-10-27 14:52:18 +0000 |
| commit | e99125adf1498e0796d6b4012c50bed9c1a25672 (patch) | |
| tree | f1ea704a61124f02ffa23a1c91459b43d73a85c5 /includes/installer/OracleInstaller.php | |
| parent | c7e101b7bf1ec5076412648984a4de2bf994cfaa (diff) | |
| download | mediawikicore-e99125adf1498e0796d6b4012c50bed9c1a25672.tar.gz mediawikicore-e99125adf1498e0796d6b4012c50bed9c1a25672.zip | |
* installers skips recreation of existing user
* updater for 16->17 schema changes
* i dedicate this revision to my greatest supporter ... Reedy :)
Notes
Notes:
http://mediawiki.org/wiki/Special:Code/MediaWiki/75545
Diffstat (limited to 'includes/installer/OracleInstaller.php')
| -rw-r--r-- | includes/installer/OracleInstaller.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php index 5c3ec18aec9f..d01bb3466a09 100644 --- a/includes/installer/OracleInstaller.php +++ b/includes/installer/OracleInstaller.php @@ -176,15 +176,17 @@ class OracleInstaller extends DatabaseInstaller { if ( !$status->isOK() ) { return $status; } - - global $_OracleDefTS, $_OracleTempTS; - $_OracleDefTS = $this->getVar( '_OracleDefTS' ); - $_OracleTempTS = $this->getVar( '_OracleTempTS' ); - $error = $this->db->sourceFile( "$IP/maintenance/oracle/user.sql" ); - if ( $error !== true || !$this->db->selectDB( $this->getVar( 'wgDBuser' ) ) ) { - $status->fatal( 'config-install-user-failed', $this->getVar( 'wgDBuser' ), $error ); + + if ( !$this->db->selectDB( $this->getVar( 'wgDBuser' ) ) ) { + global $_OracleDefTS, $_OracleTempTS; + $_OracleDefTS = $this->getVar( '_OracleDefTS' ); + $_OracleTempTS = $this->getVar( '_OracleTempTS' ); + $error = $this->db->sourceFile( "$IP/maintenance/oracle/user.sql" ); + if ( $error !== true || !$this->db->selectDB( $this->getVar( 'wgDBuser' ) ) ) { + $status->fatal( 'config-install-user-failed', $this->getVar( 'wgDBuser' ), $error ); + } } - + return $status; } |