diff --git a/typo3/sysext/install/Classes/Controller/Action/AbstractAction.php b/typo3/sysext/install/Classes/Controller/Action/AbstractAction.php index 5b69dcbeac51164462c768eaddd21e4e603f9acf..2e75b8b163f78c0d3ea1d3412cecb1ea6d5c93b9 100644 --- a/typo3/sysext/install/Classes/Controller/Action/AbstractAction.php +++ b/typo3/sysext/install/Classes/Controller/Action/AbstractAction.php @@ -186,30 +186,6 @@ abstract class AbstractAction implements ActionInterface return $context; } - /** - * Get database instance. - * Will be initialized if it does not exist yet. - * - * @return \TYPO3\CMS\Core\Database\DatabaseConnection - */ - protected function getDatabaseConnection() - { - static $database; - if (!is_object($database)) { - /** @var \TYPO3\CMS\Core\Database\DatabaseConnection $database */ - $database = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\DatabaseConnection::class); - $database->setDatabaseUsername($GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['user']); - $database->setDatabasePassword($GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['password']); - $database->setDatabaseHost($GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['host']); - $database->setDatabasePort($GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['port']); - $database->setDatabaseSocket($GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['unix_socket']); - $database->setDatabaseName($GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['dbname']); - $database->initialize(); - $database->connectDB(); - } - return $database; - } - /** * Some actions like the database analyzer and the upgrade wizards need additional * bootstrap actions performed. diff --git a/typo3/sysext/install/Classes/Controller/Action/Tool/UpgradeWizard.php b/typo3/sysext/install/Classes/Controller/Action/Tool/UpgradeWizard.php index 05b0f1a2c61f8f9e99a9b8680f1577e2687abca4..fc8fd6c6737be5906dfd809b779fbd54f4dc4325 100644 --- a/typo3/sysext/install/Classes/Controller/Action/Tool/UpgradeWizard.php +++ b/typo3/sysext/install/Classes/Controller/Action/Tool/UpgradeWizard.php @@ -284,8 +284,6 @@ class UpgradeWizard extends Action\AbstractAction */ protected function performUpdate() { - $this->getDatabaseConnection()->store_lastBuiltQuery = true; - $wizardIdentifier = $this->postValues['values']['identifier']; $className = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update'][$wizardIdentifier]; $updateObject = $this->getUpdateObjectInstance($className, $wizardIdentifier); @@ -336,8 +334,6 @@ class UpgradeWizard extends Action\AbstractAction $this->view->assign('wizardData', $wizardData); - $this->getDatabaseConnection()->store_lastBuiltQuery = false; - // Next update wizard, if available $nextUpdate = $this->getNextUpdateInstance($updateObject); $nextUpdateIdentifier = '';