diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php index 909abc3..930dc57 100644 --- a/core/modules/comment/src/Entity/Comment.php +++ b/core/modules/comment/src/Entity/Comment.php @@ -333,6 +333,7 @@ public static function bundleFieldDefinitions(EntityTypeInterface $entity_type, * {@inheritdoc} */ public function hasParentComment() { + // Do not load parent comment entity. return (bool) $this->get('pid')->target_id; } diff --git a/core/modules/comment/templates/comment.html.twig b/core/modules/comment/templates/comment.html.twig index 75604b9..37dd72f 100644 --- a/core/modules/comment/templates/comment.html.twig +++ b/core/modules/comment/templates/comment.html.twig @@ -45,21 +45,16 @@ * * These variables are provided to give context about the parent comment (if * any): - * - comment_parent: Full parent comment entity (if any). + * - parent_comment: Full parent comment entity (if any). * - parent_author: Equivalent to author for the parent comment. * - parent_created: Equivalent to created for the parent comment. * - parent_changed: Equivalent to changed for the parent comment. * - parent_title: Equivalent to title for the parent comment. * - parent_permalink: Equivalent to permalink for the parent comment. - * - parent: A text string of parent comment submission information created from - * 'parent_author' and 'parent_created' during template_preprocess_comment(). - * This information is presented to help screen readers follow lengthy - * discussion threads. You can hide this from sighted users using the class - * visually-hidden. * * These two variables are provided for context: * - comment: Full comment object. - * - entity: Entity the comments are attached to. + * - commented_entity: Entity the comments are attached to. * * @see template_preprocess_comment() * @@ -93,9 +88,14 @@ Indicate the semantic relationship between parent and child comments for accessibility. The list is difficult to navigate in a screen reader without this information. + This information is presented to help screen readers follow lengthy + discussion threads. You can hide this from sighted users using the class + visually-hidden. #} - {% if parent %} -

{{ parent }}

+ {% if parent_comment %} +

{{ 'In reply to !parent_title by + !parent_author'|t({ '!parent_title': parent_title, '!parent_author': + parent_author }) }}

{% endif %} {{ permalink }} diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig index 1d6718d..58524cd 100644 --- a/core/themes/bartik/templates/comment.html.twig +++ b/core/themes/bartik/templates/comment.html.twig @@ -45,21 +45,16 @@ * * These variables are provided to give context about the parent comment (if * any): - * - comment_parent: Full parent comment entity (if any). + * - parent_comment: Full parent comment entity (if any). * - parent_author: Equivalent to author for the parent comment. * - parent_created: Equivalent to created for the parent comment. * - parent_changed: Equivalent to changed for the parent comment. * - parent_title: Equivalent to title for the parent comment. * - parent_permalink: Equivalent to permalink for the parent comment. - * - parent: A text string of parent comment submission information created from - * 'parent_author' and 'parent_created' during template_preprocess_comment(). - * This information is presented to help screen readers follow lengthy - * discussion threads. You can hide this from sighted users using the class - * visually-hidden. * * These two variables are provided for context: * - comment: Full comment object. - * - entity: Entity the comments are attached to. + * - commented_entity: Entity the comments are attached to. * * @see template_preprocess_comment() */ @@ -82,12 +77,18 @@

{{ created }}

{# - // Indicate the semantic relationship between parent and child comments - // for accessibility. The list is difficult to navigate in a screen - // reader without this information. + Indicate the semantic relationship between parent and child comments + for accessibility. The list is difficult to navigate in a screen + reader without this information. + This information is presented to help screen readers follow lengthy + discussion threads. You can hide this from sighted users using the class + visually-hidden. #} - {% if parent %} -

{{ parent }}

+ {% if parent_comment %} +

+ {{ 'In reply to !parent_title by !parent_author'|t({ '!parent_title': + parent_title, '!parent_author': parent_author }) }} +

{% endif %} diff --git a/core/themes/classy/templates/content/comment.html.twig b/core/themes/classy/templates/content/comment.html.twig index ba62e2b..8d8e75e 100644 --- a/core/themes/classy/templates/content/comment.html.twig +++ b/core/themes/classy/templates/content/comment.html.twig @@ -46,20 +46,15 @@ * These variables are provided to give context about the parent comment (if * any): * - comment_parent: Full parent comment entity (if any). - * - parent_author: Equivalent to author for the parent comment. + * - parent_comment: Full parent comment entity (if any). * - parent_created: Equivalent to created for the parent comment. * - parent_changed: Equivalent to changed for the parent comment. * - parent_title: Equivalent to title for the parent comment. * - parent_permalink: Equivalent to permalink for the parent comment. - * - parent: A text string of parent comment submission information created from - * 'parent_author' and 'parent_created' during template_preprocess_comment(). - * This information is presented to help screen readers follow lengthy - * discussion threads. You can hide this from sighted users using the class - * visually-hidden. * * These two variables are provided for context: * - comment: Full comment object. - * - entity: Entity the comments are attached to. + * - commented_entity: Entity the comments are attached to. * * @see template_preprocess_comment() * @@ -98,12 +93,14 @@

{{ submitted }}

{# - Indicate the semantic relationship between parent and child comments - for accessibility. The list is difficult to navigate in a screen - reader without this information. + This information is presented to help screen readers follow lengthy + discussion threads. You can hide this from sighted users using the class + visually-hidden. #} - {% if parent %} -

{{ parent }}

+ {% if parent_comment %} +

{{ 'In reply to !parent_title by + !parent_author'|t({ '!parent_title': parent_title, '!parent_author': + parent_author }) }}

{% endif %} {{ permalink }}