EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid null-pointer exception

Browse Source
This commit is contained in:
Björn Fromme
2022-03-08 17:47:50 +01:00
parent 77e2e7690b
commit 3298885ef0
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php
+8 -1
View File
@@ -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,
] ]
); );
} }
public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html
+11 -9
View File
@@ -43,15 +43,17 @@
<f:format.nl2br>{newsItem.teaser}</f:format.nl2br> <f:format.nl2br>{newsItem.teaser}</f:format.nl2br>
</p> </p>
</f:if> </f:if>
<n:renderMedia news="{newsItem}" imgClass="block w-full h-auto mb-4" videoClass="video-wrapper" audioClass="audio-wrapper"> <div data-rte-content>
<f:render partial="Detail/MediaContainer" arguments="{media: newsItem.media, settings:settings, id: newsItem.uid}" /> <n:renderMedia news="{newsItem}" imgClass="block w-full h-auto mb-4" videoClass="video-wrapper" audioClass="audio-wrapper">
<f:format.html>{newsItem.bodytext}</f:format.html> <f:render partial="Detail/MediaContainer" arguments="{media: newsItem.media, settings:settings, id: newsItem.uid}" />
<f:if condition="{newsItem.contentElements}"> <f:format.html>{newsItem.bodytext}</f:format.html>
<div class="flex flex-col space-y-4"> <f:if condition="{newsItem.contentElements}">
<f:cObject typoscriptObjectPath="lib.tx_news.contentElementRendering">{newsItem.contentElementIdList}</f:cObject> <div class="flex flex-col space-y-4">
</div> <f:cObject typoscriptObjectPath="lib.tx_news.contentElementRendering">{newsItem.contentElementIdList}</f:cObject>
</f:if> </div>
</n:renderMedia> </f:if>
</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