Oracle configuration was not written when using new Install Tool (as it jumped direct...
authorXavier Perseguers <typo3@perseguers.ch>
Thu, 29 Apr 2010 13:43:30 +0000 (13:43 +0000)
committerXavier Perseguers <typo3@perseguers.ch>
Thu, 29 Apr 2010 13:43:30 +0000 (13:43 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/dbal/trunk@32743 735d13b6-9817-0410-8766-e36946ffe9aa

typo3/sysext/dbal/class.user_tx_install_hook.php
typo3/sysext/dbal/class.ux_t3lib_db.php

index e216473..06a8ac5 100644 (file)
@@ -69,7 +69,11 @@ class user_tx_install_hook {
        public function executeLocalconf(array &$lines, $step, tx_install $instObj) {
                switch ($step) {
                        case 3:
+                       case 4:
                                $driver = $instObj->INSTALL['localconf.php']['typo_db_driver'];
+                               if (!$driver) {
+                                       break;
+                               }
                                $driverConfig = '';
                                switch ($driver) {
                                        case 'oci8':
index 352a23b..19e6dac 100644 (file)
@@ -2480,6 +2480,10 @@ class ux_t3lib_DB extends t3lib_DB {
                $output = FALSE;
 
                if (is_array($cfgArray)) {
+                       if (!$cfgArray['config']['database']) {
+                                       // Configuration is incomplete
+                               return;
+                       }
                        switch ($handlerType) {
                                case 'native':
                                        if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['no_pconnect']) {