Fixed bug #16444: DBAL installs itself automatically whenever the install tool is...

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

diff --git a/typo3/sysext/dbal/ChangeLog b/typo3/sysext/dbal/ChangeLog
index 61ee67b..11b729c 100644 (file)
--- a/typo3/sysext/dbal/ChangeLog
+++ b/typo3/sysext/dbal/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-17  Xavier Perseguers  <typo3@perseguers.ch>
+
+       * Fixed bug #16444: DBAL installs itself automatically whenever the install tool is called
+
 2010-11-14  Xavier Perseguers  <typo3@perseguers.ch>
 
        * Set version to 1.2.0beta1

diff --git a/typo3/sysext/dbal/class.tx_dbal_autoloader.php b/typo3/sysext/dbal/class.tx_dbal_autoloader.php
index 1b723aa..ca79dad 100644 (file)
--- a/typo3/sysext/dbal/class.tx_dbal_autoloader.php
+++ b/typo3/sysext/dbal/class.tx_dbal_autoloader.php
@@ -45,28 +45,30 @@ class tx_dbal_autoloader {
         * @return void
         */
        public function execute(tx_install $instObj) {
-               switch ($instObj->step) {
-                       case 0:
-                               if (!t3lib_extMgm::isLoaded('dbal') && $this->isDbalSupported()) {
-                                       $this->activateDbal();
+               if ($instObj->mode = '123') {
+                       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()) {
-                                       $this->activateDbal();
-                               }
-                               break;
-                       case 3:
-                               $driver = $instObj->INSTALL['localconf.php']['typo_db_driver'];
-                               if ($driver === 'mysql') {
-                                       $this->deactivateDbal();
-                               }
-                               break;
+                                                       // 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()) {
+                                               $this->activateDbal();
+                                       }
+                                       break;
+                               case 3:
+                                       $driver = $instObj->INSTALL['localconf.php']['typo_db_driver'];
+                                       if ($driver === 'mysql') {
+                                               $this->deactivateDbal();
+                                       }
+                                       break;
+                       }
                }
        }