Skip to content
Snippets Groups Projects
Commit 808cc569 authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !126
parents d7697dbe ec7b96f2
Branches
Tags v1.7.3
1 merge request!126Merging develop into main
Pipeline #1162038 passed
......@@ -71,7 +71,8 @@
"#2827055 Add option to show only start or end date in the DateTime Range custom formatter": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/daterange_display_mode.diff",
"#3073822 Error: Call to a member function access() on null in Drupal\\comment\\CommentAccessControlHandler->checkAccess()": "https://www.drupal.org/files/issues/2023-01-12/3073822-12.patch",
"#2761273 Exposed filter values as token": "https://www.drupal.org/files/issues/2022-10-30/2761273-50.patch",
"#2955321 Non-translatable fields": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/2955321.diff"
"#2955321 Non-translatable fields": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/2955321.diff",
"#3420862 Empty comment body": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3420862.diff"
},
"drupal/diff": {
"#3311234 Link to diff with prev rev": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3311234.diff?v=3",
......
diff --git a/core/modules/comment/src/CommentForm.php b/core/modules/comment/src/CommentForm.php
index 1b2d8f02201df0131d12a8a2587680032054c034..5ba5d79cdb9f6855b7c239957a8b026f1824f2da 100644
--- a/core/modules/comment/src/CommentForm.php
+++ b/core/modules/comment/src/CommentForm.php
@@ -325,7 +325,7 @@ public function buildEntity(array $form, FormStateInterface $form_state) {
// 1) Filter it into HTML
// 2) Strip out all HTML tags
// 3) Convert entities back to plain-text.
- $comment_text = $comment->comment_body->processed;
+ $comment_text = $comment->comment_body->processed ?? '';
$comment->setSubject(Unicode::truncate(trim(Html::decodeEntities(strip_tags($comment_text))), 29, TRUE, TRUE));
}
// Edge cases where the comment body is populated only by HTML tags will
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment