[BUGFIX] Respect different object mapping for scheduler tasks 93/33493/2
authorMathias Brodala <mbrodala@pagemachine.de>
Mon, 14 Jul 2014 07:26:18 +0000 (09:26 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Thu, 23 Oct 2014 21:01:58 +0000 (23:01 +0200)
Resolves: #60296
Releases: master, 6.2, 6.1
Change-Id: I7bff792b33ffecbe53ac4aee848e6ad16318a538
Reviewed-on: http://review.typo3.org/33493
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/extbase/Classes/Scheduler/TaskExecutor.php

index 466bfae..44e35fa 100644 (file)
@@ -75,10 +75,10 @@ class TaskExecutor implements \TYPO3\CMS\Core\SingletonInterface {
                $this->configurationManager->setContentObject(\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer'));
                $this->configurationManager->setConfiguration($configuration);
                // configure object container
-               $typoScriptSetup = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
-               if (isset($typoScriptSetup['config.']['tx_extbase.']['objects.'])) {
+               $frameworkConfiguration = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
+               if (isset($frameworkConfiguration['objects'])) {
                        $objectContainer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\Container\\Container');
-                       foreach ($typoScriptSetup['config.']['tx_extbase.']['objects.'] as $classNameWithDot => $classConfiguration) {
+                       foreach ($frameworkConfiguration['objects'] as $classNameWithDot => $classConfiguration) {
                                if (isset($classConfiguration['className'])) {
                                        $originalClassName = rtrim($classNameWithDot, '.');
                                        $objectContainer->registerImplementation($originalClassName, $classConfiguration['className']);