Skip to content

Commit 79222f2

Browse files
authored
Merge pull request #143 from sitegeist/bugfix/restoreObjectManager
[BUGFIX] Restore usage of objectManager for v11
2 parents 7991ea3 + 786c73f commit 79222f2

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Classes/Fluid/ViewHelper/ComponentResolver.php

+6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
1010
use TYPO3\CMS\Core\DependencyInjection\FailsafeContainer;
1111
use TYPO3\CMS\Core\Http\ApplicationType;
12+
use TYPO3\CMS\Core\Information\Typo3Version;
1213
use TYPO3\CMS\Core\Utility\GeneralUtility;
14+
use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
1315
use TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperResolver;
1416
use TYPO3Fluid\Fluid\Core\Parser\Exception as ParserException;
1517
use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface;
@@ -61,6 +63,10 @@ public function createViewHelperInstanceFromClassName($viewHelperClassName): Vie
6163
if ($this->container->has($viewHelperClassName)) {
6264
/** @var ViewHelperInterface $viewHelperInstance */
6365
$viewHelperInstance = $this->container->get($viewHelperClassName);
66+
} elseif ((new Typo3Version())->getMajorVersion() < 12) {
67+
$objectManager = GeneralUtility::makeInstance(ObjectManagerInterface::class);
68+
/** @var ViewHelperInterface $viewHelperInstance */
69+
$viewHelperInstance = $objectManager->get($viewHelperClassName);
6470
} else {
6571
/** @var ViewHelperInterface $viewHelperInstance */
6672
$viewHelperInstance = new $viewHelperClassName;

0 commit comments

Comments
 (0)