Merge branch 'main' into invalid_csrf_token

MbinOrg · Sep 14, 2024 · 9e1e1e7 · 9e1e1e7
2 parents b3d8121 + 89c1334
commit 9e1e1e7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/templates/entry/comment/view.html.twig b/templates/entry/comment/view.html.twig
@@ -46,11 +46,23 @@
         }) }}"
         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,
-        }) }}
+        {% set entryComment = comment.root ?? comment %}
+        {% if entryComment is defined and entryComment is not null %}
+            {{ component('entry_comment', {
+                comment: entryComment,
+                showEntryTitle: false,
+                showMagazineName: false,
+                showNested: true,
+            }) }}
+        {% else %}
+        <div class="section alert alert__danger">
+            <p>
+                <a href="{{ entry_url(entry) }}" class="btn btn-link btn__danger" style="margin-right: 10px;">
+                    <i class="fa-solid fa-arrow-left-long" title="{{ 'back'|trans }}"></i> {{ 'back'|trans }}
+                </a>
+                {{ 'comment_not_found'|trans }}
+            </p>
+        </div>
+        {% endif %}
     </div>
 {% endblock %}
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
@@ -896,3 +896,4 @@ admin_users_suspended: Suspended
 admin_users_banned: Banned
 user_verify: Activate account
 max_image_size: Maximum file size
+comment_not_found: Comment not found