Fixed bug #16678: DBAL is active with MySQL at the end of 1-2-3 wizard

git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/dbal/trunk@40825 735d13b6-9817-0410-8766-e36946ffe9aa

diff --git a/typo3/sysext/dbal/ChangeLog b/typo3/sysext/dbal/ChangeLog
index 2754e31..a550180 100644 (file)
--- a/typo3/sysext/dbal/ChangeLog
+++ b/typo3/sysext/dbal/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-05  Xavier Perseguers  <typo3@perseguers.ch>
+
+       * Fixed bug #16678: DBAL is active with MySQL at the end of 1-2-3 wizard
+
 2010-12-02  Xavier Perseguers  <typo3@perseguers.ch>
 
        * Fixed bug #16639: Install Tool is unusable since DBAL merge

diff --git a/typo3/sysext/dbal/class.tx_dbal_autoloader.php b/typo3/sysext/dbal/class.tx_dbal_autoloader.php
index 03fc62d..f46afea 100644 (file)
--- a/typo3/sysext/dbal/class.tx_dbal_autoloader.php
+++ b/typo3/sysext/dbal/class.tx_dbal_autoloader.php
@@ -48,7 +48,7 @@ class tx_dbal_autoloader {
                if ($instObj->mode == '123') {
                        switch ($instObj->step) {
                                case 0:
-                                       if (!t3lib_extMgm::isLoaded('dbal') && $this->isDbalSupported()) {
+                                       if (!is_array($instObj->INSTALL) && !t3lib_extMgm::isLoaded('dbal') && $this->isDbalSupported()) {
                                                $this->activateDbal();
 
                                                // Reload page to have Install Tool actually load DBAL