Fixed bug #16179: 1-2-3 install tool wizard does not let DBAL load early enough

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

diff --git a/typo3/sysext/dbal/ChangeLog b/typo3/sysext/dbal/ChangeLog
index eff4c65..2b6aac6 100644 (file)
--- a/typo3/sysext/dbal/ChangeLog
+++ b/typo3/sysext/dbal/ChangeLog
@@ -1,5 +1,6 @@
 2010-10-30  Xavier Perseguers  <typo3@perseguers.ch>
 
+       * Fixed bug #16179: 1-2-3 install tool wizard does not let DBAL load early enough
        * Fixed bug #15941: Log deprecated functions (and adjust comments)
        * Fixed bug #15960: Misleading error message in ux_t3lib_DB->cacheFieldInfo() (thanks to Martin Kuster)
        * Fixed bug #16120: UPDATE queries fails for $GLOBALS['TYPO3_DB']->sql_query (thanks to Alan Oguzhan)

diff --git a/typo3/sysext/dbal/class.tx_dbal_autoloader.php b/typo3/sysext/dbal/class.tx_dbal_autoloader.php
index 3d1be1d..1b723aa 100644 (file)
--- a/typo3/sysext/dbal/class.tx_dbal_autoloader.php
+++ b/typo3/sysext/dbal/class.tx_dbal_autoloader.php
@@ -46,6 +46,15 @@ class tx_dbal_autoloader {
         */
        public function execute(tx_install $instObj) {
                switch ($instObj->step) {
+                       case 0:
+                               if (!t3lib_extMgm::isLoaded('dbal') && $this->isDbalSupported()) {
+                                       $this->activateDbal();
+
+                                               // Reload page to have Install Tool actually load DBAL
+                                       $redirectUrl = t3lib_div::getIndpEnv('TYPO3_REQUEST_URL');
+                                       t3lib_utility_Http::redirect($redirectUrl);
+                               }
+                               break;
                        case 1:
                        case 2:
                                if (!t3lib_extMgm::isLoaded('dbal') && $this->isDbalSupported()) {