Misc whitespace changes, mostly EOL w/s and indention fixes so TAB = 4 spaces

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

diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php
index cc5c6c7..4a1d724 100644 (file)
--- a/includes/installer/OracleInstaller.php
+++ b/includes/installer/OracleInstaller.php
@@ -5,10 +5,10 @@
  * @file
  * @ingroup Deployment
  */
- 
+
 /**
  * Class for setting up the MediaWiki database using Oracle.
- * 
+ *
  * @ingroup Deployment
  * @since 1.17
  */
@@ -46,8 +46,7 @@ class OracleInstaller extends DatabaseInstaller {
                        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->getPasswordBox( 'wgDBpassword', 'config-db-password', array(), $this->parent->getHelpBox( 'config-db-web-help' ) ) .
                        $this->getCheckBox( '_CreateDBAccount', 'config-db-web-create', array( 'disabled' => true ) ).
                        Html::closeElement( 'div' ) . Html::closeElement( 'fieldset' );
        }
@@ -56,14 +55,12 @@ class OracleInstaller extends DatabaseInstaller {
                $this->parent->setVar( '_InstallUser', 'sys' );
                $this->parent->setVar( 'wgDBserver', '' );
                return
-                       $this->getTextBox( 'wgDBserver', 'config-db-host-oracle' ) .
-                       $this->parent->getHelpBox( 'config-db-host-oracle-help' ) . 
+                       $this->getTextBox( 'wgDBserver', 'config-db-host-oracle', array(), $this->parent->getHelpBox( 'config-db-host-oracle-help' ) ) .
                        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' ) .
+                       $this->getTextBox( '_OracleTempTS', 'config-oracle-temp-ts', array(), $this->parent->getHelpBox( 'config-db-oracle-help' ) ) .
                        Html::closeElement( 'fieldset' ) .
                        $this->getInstallUserBox().
                        $this->getWebUserBox();
@@ -175,7 +172,7 @@ class OracleInstaller extends DatabaseInstaller {
                if ( !$status->isOK() ) {
                        return $status;
                }
-               
+
                if ( !$this->db->selectDB( $this->getVar( 'wgDBuser' ) ) ) {
                        /**
                         * The variables $_OracleDefTS, $_OracleTempTS are used by maintenance/oracle/user.sql
@@ -188,7 +185,7 @@ class OracleInstaller extends DatabaseInstaller {
                                $status->fatal( 'config-install-user-failed', $this->getVar( 'wgDBuser' ), $error );
                        }
                }
-               
+
                return $status;
        }
 
@@ -198,12 +195,12 @@ class OracleInstaller extends DatabaseInstaller {
        public function createTables() {
                $status = parent::createTables();
 
-               $this->db->doQuery( 'BEGIN fill_wiki_info; END;' );
+               $this->db->query( 'BEGIN fill_wiki_info; END;' );
 
                return $status;
        }
 
-               
+
        public function getLocalSettings() {
                $prefix = $this->getVar( 'wgDBprefix' );
                return