Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX] Load dbal information if active #404

Merged
merged 3 commits into from
Jan 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ script:
- typo3cms extension:activate core && typo3cms database:updateschema | grep 'No schema updates were performed'
- typo3cms extension:setup core && typo3cms database:updateschema | grep 'No schema updates were performed'
- typo3cms extension:setupactive && typo3cms database:updateschema | grep 'No schema updates were performed'
- if typo3cms extension:list --raw | grep dbal; then typo3cms extension:activate adodb,dbal && typo3cms database:updateschema | grep 'No schema updates were performed'; fi
- typo3cms extension:removeinactive --force | grep 'The following directories have been removed'

after_script:
Expand Down
4 changes: 4 additions & 0 deletions Classes/Core/Booting/Scripts.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend;
use TYPO3\CMS\Core\Cache\CacheManager;
use TYPO3\CMS\Core\Database\DatabaseConnection;
use TYPO3\CMS\Core\Package\PackageManager;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;

Expand Down Expand Up @@ -121,6 +122,9 @@ public static function reEnableOriginalCoreCaches(ConsoleBootstrap $bootstrap)
*/
public static function initializeCachingFramework(ConsoleBootstrap $bootstrap)
{
if ($bootstrap->getEarlyInstance(PackageManager::class)->isPackageActive('dbal')) {
require GeneralUtility::getFileAbsFileName('EXT:dbal/ext_localconf.php');
}
$cacheManager = new \TYPO3\CMS\Core\Cache\CacheManager();
$cacheManager->setCacheConfigurations($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']);
\TYPO3\CMS\Core\Utility\GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Cache\CacheManager::class, $cacheManager);
Expand Down