Skip to content

Commit

Permalink
[BUGFIX] Restore usage of objectManager for v11
Browse files Browse the repository at this point in the history
  • Loading branch information
s2b committed May 16, 2023
1 parent 7991ea3 commit b4557d5
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Classes/Fluid/ViewHelper/ComponentResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\DependencyInjection\FailsafeContainer;
use TYPO3\CMS\Core\Http\ApplicationType;
use TYPO3\CMS\Core\Information\Typo3Version;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperResolver;
use TYPO3Fluid\Fluid\Core\Parser\Exception as ParserException;
use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface;
Expand Down Expand Up @@ -61,6 +63,10 @@ public function createViewHelperInstanceFromClassName($viewHelperClassName): Vie
if ($this->container->has($viewHelperClassName)) {
/** @var ViewHelperInterface $viewHelperInstance */
$viewHelperInstance = $this->container->get($viewHelperClassName);
} elseif (new Typo3Version()->getMajorVersion() < 12) {
$objectManager = GeneralUtility::makeInstance(ObjectManagerInterface::class);
/** @var ViewHelperInterface $viewHelperInstance */
$viewHelperInstance = $objectManager->get($viewHelperClassName);
} else {
/** @var ViewHelperInterface $viewHelperInstance */
$viewHelperInstance = new $viewHelperClassName;
Expand Down

0 comments on commit b4557d5

Please sign in to comment.