diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index 71ac3cd..395378b 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -1234,6 +1234,9 @@ function comment_preprocess_field(&$variables) { $variables['attributes']['class'][] = 'comment-wrapper'; $variables['title_attributes']['class'][] = 'title'; + // Append additional attributes (eg. rdf) from the first field item. + $variables['attributes'] += $variables['item_attributes'][0]->storage(); + // Create separate variables for the comments and comment form. $variables['comments'] = $element[0]['comments']; $variables['comment_form'] = $element[0]['comment_form']; diff --git a/core/modules/comment/src/Tests/CommentNonNodeTest.php b/core/modules/comment/src/Tests/CommentNonNodeTest.php index e9d4c4a..72e7a50 100644 --- a/core/modules/comment/src/Tests/CommentNonNodeTest.php +++ b/core/modules/comment/src/Tests/CommentNonNodeTest.php @@ -46,7 +46,7 @@ function setUp() { // Verify that bundles are defined correctly. $bundles = \Drupal::entityManager()->getBundleInfo('comment'); - $this->assertEqual($bundles['comment']['label'], 'Comments'); + $this->assertEqual($bundles['comment']['label'], 'Comment settings'); // Create test user. $this->admin_user = $this->drupalCreateUser(array( diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml index 6d9b14c..f9ad182 100644 --- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml +++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml @@ -5,7 +5,7 @@ source: constants: entity_type: node field_name: comment - label: Comment settings + label: Comments required: true process: entity_type: 'constants/entity_type' diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php index ac5c9c7..fc5deb4 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php @@ -58,7 +58,7 @@ protected function setUp() { foreach ($this->types as $type) { entity_create('node_type', array('type' => $type))->save(); entity_create('field_instance_config', array( - 'label' => 'Comment settings', + 'label' => 'Comments', 'description' => '', 'field_name' => 'comment', 'entity_type' => 'node',