Bug #24103 » 16444_v1.diff
| typo3/sysext/dbal/class.tx_dbal_autoloader.php (Arbeitskopie) | ||
|---|---|---|
|
* @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;
|
||
|
}
|
||
|
}
|
||
|
}
|
||
| typo3/sysext/install/mod/class.tx_install.php (Arbeitskopie) | ||
|---|---|---|
|
header('Pragma: no-cache');
|
||
|
}
|
||
|
// Let DBAL decide whether to load itself
|
||
|
$dbalLoaderFile = $this->backPath . 'sysext/dbal/class.tx_dbal_autoloader.php';
|
||
|
if (@is_file($dbalLoaderFile)) {
|
||
|
include($dbalLoaderFile);
|
||
|
}
|
||
|
// ****************************
|
||
|
// Initializing incoming vars.
|
||
|
// ****************************
|
||
| ... | ... | |
|
$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) {
|
||