From 53228984e822352deb7490a84faa12cf82cdcacf Mon Sep 17 00:00:00 2001
From: Melroy van den Berg <melroy@melroy.org>
Date: Fri, 13 Sep 2024 14:37:44 +0200
Subject: [PATCH] Check if EntryComment is defined and not null...?EntryComment
 can be null after all during the __invoke

---
 templates/entry/comment/view.html.twig | 28 +++++++++++++++-----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/templates/entry/comment/view.html.twig b/templates/entry/comment/view.html.twig
index 5538e09e5..4423f570c 100644
--- a/templates/entry/comment/view.html.twig
+++ b/templates/entry/comment/view.html.twig
@@ -41,16 +41,20 @@
     </div>
     {% set autoAction = 'notifications:EntryCommentCreatedNotification@window->subject-list#addComment' %}
     {% set manualAction = 'notifications:EntryCommentCreatedNotification@window->subject-list#increaseCounter' %}
-    <div class="{{ html_classes('comments entry-comments comments-tree', {
-        'show-comment-avatar' : SHOW_COMMENT_USER_AVATARS is same as V_TRUE
-        }) }}"
-        data-controller="subject-list"
-        data-action="{{- DYNAMIC_LISTS is same as V_TRUE ? autoAction : manualAction -}}">
-        {{ component('entry_comment', {
-            comment: comment.root ?? comment,
-            showEntryTitle: false,
-            showMagazineName: false,
-            showNested: true,
-        }) }}
-    </div>
+
+    {% set entryComment = comment.root ?? comment %}
+    {% if entryComment is defined and entryComment is not null %}
+        <div class="{{ html_classes('comments entry-comments comments-tree', {
+            'show-comment-avatar' : SHOW_COMMENT_USER_AVATARS is same as V_TRUE
+            }) }}"
+            data-controller="subject-list"
+            data-action="{{- DYNAMIC_LISTS is same as V_TRUE ? autoAction : manualAction -}}">
+            {{ component('entry_comment', {
+                comment: entryComment,
+                showEntryTitle: false,
+                showMagazineName: false,
+                showNested: true,
+            }) }}
+        </div>
+    {% endif %}
 {% endblock %}