From 3298885ef0f191db2c3bccc35de344318d5c2c18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Tue, 8 Mar 2022 17:47:50 +0100
Subject: [PATCH] Avoid null-pointer exception

---
 .../ViewHelpers/Uri/ProductViewHelper.php     |  9 ++++++++-
 .../Private/Templates/News/News/Detail.html   | 20 ++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/public/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php b/public/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php
index 04b18f6b..974bf61a 100644
--- a/public/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php
+++ b/public/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php
@@ -92,9 +92,16 @@ class ProductViewHelper extends AbstractViewHelper
         } else {
             /** @var ContentObjectRenderer $contentObject */
             $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(
                 [
-                    'parameter' => is_array($product) ? $product['detailPage'] : $product->getUid(),
+                    'parameter' => $param,
                 ]
             );
         }
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html
index b4d1d672..bd72a691 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html
@@ -43,15 +43,17 @@
                         <f:format.nl2br>{newsItem.teaser}</f:format.nl2br>
                     </p>
                 </f:if>
-                <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:format.html>{newsItem.bodytext}</f:format.html>
-                    <f:if condition="{newsItem.contentElements}">
-                        <div class="flex flex-col space-y-4">
-                            <f:cObject typoscriptObjectPath="lib.tx_news.contentElementRendering">{newsItem.contentElementIdList}</f:cObject>
-                        </div>
-                    </f:if>
-                </n:renderMedia>
+                <div data-rte-content>
+                    <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:format.html>{newsItem.bodytext}</f:format.html>
+                        <f:if condition="{newsItem.contentElements}">
+                            <div class="flex flex-col space-y-4">
+                                <f:cObject typoscriptObjectPath="lib.tx_news.contentElementRendering">{newsItem.contentElementIdList}</f:cObject>
+                            </div>
+                        </f:if>
+                    </n:renderMedia>
+                </div>
                 <f:if condition="{newsItem.relatedFiles}">
                     <h3 class="headline headline--underlined">
                         Dateien