Follow-up to #16444: 1-2-3 wizard dies when MySQL driver is not available
authorXavier Perseguers <typo3@perseguers.ch>
Mon, 6 Dec 2010 14:21:00 +0000 (14:21 +0000)
committerXavier Perseguers <typo3@perseguers.ch>
Mon, 6 Dec 2010 14:21:00 +0000 (14:21 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9759 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/install/mod/class.tx_install.php

index 2cc77fc..081d1b3 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-06  Xavier Perseguers  <typo3@perseguers.ch>
+
+       * Follow-up to #16444: 1-2-3 wizard dies when MySQL driver is not available
+
 2010-12-05  Steffen Gebert  <steffen@steffen-gebert.de>
 
        * Fixed bug #16574: PHP notices from XCLASS inclusions
index f1e1caa..75ae817 100755 (executable)
@@ -288,7 +288,15 @@ class tx_install extends t3lib_install {
                $this->mode = t3lib_div::_GP('mode');
                if ($this->mode !== '123') {
                        $this->mode = '';
-               } else {
+               }
+
+                       // Let DBAL decide whether to load itself
+               $dbalLoaderFile = $this->backPath . 'sysext/dbal/class.tx_dbal_autoloader.php';
+               if (@is_file($dbalLoaderFile)) {
+                       include($dbalLoaderFile);
+               }
+
+               if ($this->mode === '123') {
                                // Check for mandatory PHP modules
                        $missingPhpModules = $this->getMissingPhpModules();
                        if (count($missingPhpModules) > 0) {
@@ -321,12 +329,6 @@ class tx_install extends t3lib_install {
                        $this->INSTALL['type'] = 'database';
                }
 
-                       // Let DBAL decide whether to load itself
-               $dbalLoaderFile = $this->backPath . 'sysext/dbal/class.tx_dbal_autoloader.php';
-               if (@is_file($dbalLoaderFile)) {
-                       include($dbalLoaderFile);
-               }
-
                        // Hook to raise the counter for the total steps in the 1-2-3 installer
                if (is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['additionalSteps'])) {
                        foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['additionalSteps'] as $classData) {