Skip to content

Commit 60da7c6

Browse files
authored
Merge branch 'sitegeist:master' into master
2 parents be6cdcb + 9207963 commit 60da7c6

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

Classes/Fluid/ViewHelper/ComponentResolver.php

+8-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,14 @@ public function createViewHelperInstanceFromClassName($viewHelperClassName): Vie
5757
return $viewHelperInstance;
5858
}
5959

60-
if ($this->container->has($viewHelperClassName)) {
61-
/** @var ViewHelperInterface $viewHelperInstance */
62-
$viewHelperInstance = $this->container->get($viewHelperClassName);
60+
if (class_exists($viewHelperClassName)) {
61+
if ($this->container->has($viewHelperClassName)) {
62+
/** @var ViewHelperInterface $viewHelperInstance */
63+
$viewHelperInstance = $this->container->get($viewHelperClassName);
64+
} else {
65+
/** @var ViewHelperInterface $viewHelperInstance */
66+
$viewHelperInstance = new $viewHelperClassName;
67+
}
6368
return $viewHelperInstance;
6469
} else {
6570
// Redirect all components to special ViewHelper ComponentRenderer

0 commit comments

Comments
 (0)