Document a bit what's going on and get rid of a warning.
This commit is contained in:
parent
bd6b4d7af8
commit
dfe4979df4
1 changed files with 6 additions and 3 deletions
|
|
@ -174,9 +174,12 @@ class OracleInstaller extends DatabaseInstaller {
|
|||
}
|
||||
|
||||
if ( !$this->db->selectDB( $this->getVar( 'wgDBuser' ) ) ) {
|
||||
global $_OracleDefTS, $_OracleTempTS;
|
||||
$_OracleDefTS = $this->getVar( '_OracleDefTS' );
|
||||
$_OracleTempTS = $this->getVar( '_OracleTempTS' );
|
||||
/**
|
||||
* The variables $_OracleDefTS, $_OracleTempTS are used by maintenance/oracle/user.sql
|
||||
* Set here for fetching in DatabaseOracle::replaceVars()
|
||||
*/
|
||||
$GLOBALS['_OracleDefTS'] = $this->getVar( '_OracleDefTS' );
|
||||
$GLOBALS['_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 );
|
||||
|
|
|
|||
Loading…
Reference in a new issue