| Index: trunk/phase3/includes/installer/OracleInstaller.php |
| — | — | @@ -174,9 +174,12 @@ |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | if ( !$this->db->selectDB( $this->getVar( 'wgDBuser' ) ) ) { |
| 178 | | - global $_OracleDefTS, $_OracleTempTS; |
| 179 | | - $_OracleDefTS = $this->getVar( '_OracleDefTS' ); |
| 180 | | - $_OracleTempTS = $this->getVar( '_OracleTempTS' ); |
| | 178 | + /** |
| | 179 | + * The variables $_OracleDefTS, $_OracleTempTS are used by maintenance/oracle/user.sql |
| | 180 | + * Set here for fetching in DatabaseOracle::replaceVars() |
| | 181 | + */ |
| | 182 | + $GLOBALS['_OracleDefTS'] = $this->getVar( '_OracleDefTS' ); |
| | 183 | + $GLOBALS['_OracleTempTS'] = $this->getVar( '_OracleTempTS' ); |
| 181 | 184 | $error = $this->db->sourceFile( "$IP/maintenance/oracle/user.sql" ); |
| 182 | 185 | if ( $error !== true || !$this->db->selectDB( $this->getVar( 'wgDBuser' ) ) ) { |
| 183 | 186 | $status->fatal( 'config-install-user-failed', $this->getVar( 'wgDBuser' ), $error ); |