Avoid null-pointer exception
This commit is contained in:
@@ -92,9 +92,16 @@ class ProductViewHelper extends AbstractViewHelper
|
|||||||
} else {
|
} else {
|
||||||
/** @var ContentObjectRenderer $contentObject */
|
/** @var ContentObjectRenderer $contentObject */
|
||||||
$contentObject = GeneralUtility::makeInstance(ContentObjectRenderer::class);
|
$contentObject = GeneralUtility::makeInstance(ContentObjectRenderer::class);
|
||||||
|
if (is_array($product)) {
|
||||||
|
$param = $product['detailPage'];
|
||||||
|
} elseif (null !== $product) {
|
||||||
|
$param = $product->getUid();
|
||||||
|
} else {
|
||||||
|
$param = null;
|
||||||
|
}
|
||||||
$uri = $contentObject->typoLink_URL(
|
$uri = $contentObject->typoLink_URL(
|
||||||
[
|
[
|
||||||
'parameter' => is_array($product) ? $product['detailPage'] : $product->getUid(),
|
'parameter' => $param,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,6 +43,7 @@
|
|||||||
<f:format.nl2br>{newsItem.teaser}</f:format.nl2br>
|
<f:format.nl2br>{newsItem.teaser}</f:format.nl2br>
|
||||||
</p>
|
</p>
|
||||||
</f:if>
|
</f:if>
|
||||||
|
<div data-rte-content>
|
||||||
<n:renderMedia news="{newsItem}" imgClass="block w-full h-auto mb-4" videoClass="video-wrapper" audioClass="audio-wrapper">
|
<n:renderMedia news="{newsItem}" imgClass="block w-full h-auto mb-4" videoClass="video-wrapper" audioClass="audio-wrapper">
|
||||||
<f:render partial="Detail/MediaContainer" arguments="{media: newsItem.media, settings:settings, id: newsItem.uid}" />
|
<f:render partial="Detail/MediaContainer" arguments="{media: newsItem.media, settings:settings, id: newsItem.uid}" />
|
||||||
<f:format.html>{newsItem.bodytext}</f:format.html>
|
<f:format.html>{newsItem.bodytext}</f:format.html>
|
||||||
@@ -52,6 +53,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</f:if>
|
</f:if>
|
||||||
</n:renderMedia>
|
</n:renderMedia>
|
||||||
|
</div>
|
||||||
<f:if condition="{newsItem.relatedFiles}">
|
<f:if condition="{newsItem.relatedFiles}">
|
||||||
<h3 class="headline headline--underlined">
|
<h3 class="headline headline--underlined">
|
||||||
Dateien
|
Dateien
|
||||||
|
|||||||
Reference in New Issue
Block a user