* Update NoLocalSettings.php for the new installer. Stop advising users to move Local...

[lhc/web/wiklou.git] / includes / installer / OracleInstaller.php

diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php
index 5c3ec18..cc5c6c7 100644 (file)
--- a/includes/installer/OracleInstaller.php
+++ b/includes/installer/OracleInstaller.php
@@ -39,18 +39,17 @@ class OracleInstaller extends DatabaseInstaller {
        }
 
        public function getWebUserBox( $noCreateMsg = false ) {
-               $name = $this->getName();
                $this->parent->setVar( '_SameAccount', false );
                $this->parent->setVar( '_CreateDBAccount', true );
                $this->parent->setVar( 'wgDBname', '' );
-               return Xml::openElement( 'fieldset' ) .
-                       Xml::element( 'legend', array(), wfMsg( 'config-db-web-account' ) ) .
-                       Xml::openElement( 'div', array( 'id' => 'dbOtherAccount' ) ) .
+               return Html::openElement( 'fieldset' ) .
+                       Html::element( 'legend', array(), wfMsg( 'config-db-web-account' ) ) .
+                       Html::openElement( 'div', array( 'id' => 'dbOtherAccount' ) ) .
                        $this->getTextBox( 'wgDBuser', 'config-db-username' ) .
                        $this->getPasswordBox( 'wgDBpassword', 'config-db-password' ) .
                        $this->parent->getHelpBox( 'config-db-web-help' ).
                        $this->getCheckBox( '_CreateDBAccount', 'config-db-web-create', array( 'disabled' => true ) ).
-                       Xml::closeElement( 'div' ) . Xml::closeElement( 'fieldset' );
+                       Html::closeElement( 'div' ) . Html::closeElement( 'fieldset' );
        }
 
        public function getConnectForm() {
@@ -59,13 +58,13 @@ class OracleInstaller extends DatabaseInstaller {
                return
                        $this->getTextBox( 'wgDBserver', 'config-db-host-oracle' ) .
                        $this->parent->getHelpBox( 'config-db-host-oracle-help' ) . 
-                       Xml::openElement( 'fieldset' ) .
-                       Xml::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) .
+                       Html::openElement( 'fieldset' ) .
+                       Html::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) .
                        $this->getTextBox( 'wgDBprefix', 'config-db-prefix' ) .
                        $this->getTextBox( '_OracleDefTS', 'config-oracle-def-ts' ) .
                        $this->getTextBox( '_OracleTempTS', 'config-oracle-temp-ts' ) .
                        $this->parent->getHelpBox( 'config-db-oracle-help' ) .
-                       Xml::closeElement( 'fieldset' ) .
+                       Html::closeElement( 'fieldset' ) .
                        $this->getInstallUserBox().
                        $this->getWebUserBox();
        }
@@ -176,15 +175,20 @@ 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' ) ) ) {
+                       /**
+                        * 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 );
+                       }
                }
-
+               
                return $status;
        }