| Index: branches/new-installer/phase3/includes/installer/OracleInstaller.php |
| — | — | @@ -11,10 +11,11 @@ |
| 12 | 12 | ); |
| 13 | 13 | |
| 14 | 14 | var $internalDefaults = array( |
| 15 | | - '_InstallUser' => 'sys', |
| 16 | | - '_InstallPassword' => '', |
| | 15 | + 'oracle_SameAccount' => false, |
| | 16 | + 'oracle_InstallUser' => 'sys' |
| 17 | 17 | ); |
| 18 | 18 | |
| | 19 | + |
| 19 | 20 | function getName() { |
| 20 | 21 | return 'oracle'; |
| 21 | 22 | } |
| Index: branches/new-installer/phase3/includes/installer/InstallerDBType.php |
| — | — | @@ -128,7 +128,9 @@ |
| 129 | 129 | function getVar( $var, $default = null ) { |
| 130 | 130 | $defaults = $this->getGlobalDefaults(); |
| 131 | 131 | $internal = $this->getInternalDefaults(); |
| 132 | | - if ( isset( $defaults[$var] ) ) { |
| | 132 | + if ( isset( $internal[$this->getName().$var] ) ) { |
| | 133 | + return $internal[$this->getName().$var]; |
| | 134 | + } elseif ( isset( $defaults[$var] ) ) { |
| 133 | 135 | $default = $defaults[$var]; |
| 134 | 136 | } elseif ( isset( $internal[$var] ) ) { |
| 135 | 137 | $default = $internal[$var]; |