From dfe4979df4e18487ba8ca33e03b8267eb315ef4e Mon Sep 17 00:00:00 2001 From: Platonides Date: Tue, 30 Nov 2010 18:24:02 +0000 Subject: [PATCH] Document a bit what's going on and get rid of a warning. --- includes/installer/OracleInstaller.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php index 19c64e17d9..d9bc098a0b 100644 --- a/includes/installer/OracleInstaller.php +++ b/includes/installer/OracleInstaller.php @@ -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 ); -- 2.20.1