From: Platonides <platonides@users.mediawiki.org>
Date: Tue, 30 Nov 2010 18:24:02 +0000 (+0000)
Subject: Document a bit what's going on and get rid of a warning.
X-Git-Tag: 1.31.0-rc.0~33680
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=dfe4979df4e18487ba8ca33e03b8267eb315ef4e;p=lhc%2Fweb%2Fwiklou.git

Document a bit what's going on and get rid of a warning.
---

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 );