Place number of comments metadata inside node template

+++ b/core/modules/rdf/rdf.module
@@ -317,32 +317,12 @@ function rdf_preprocess_node(&$variables) {
-      if ($variables['page'] && \Drupal::currentUser()->hasPermission('access comments')) {

looks like this permission check should be preserved.

We can also trim down the tests, we no longer need this extra check because now the logic is always the same (no longer dealing with the a element):

    // Makes sure we don't generate the wrong statement for number of comments.
    $node_comments_uri = url('node/' . $this->node->id(), array('fragment' => 'comments', 'absolute' => TRUE));
    $this->assertFalse($graph->hasProperty($node_comments_uri, 'http://rdfs.org/sioc/ns#num_replies', $expected_value), 'Number of comments found in RDF output of teaser view mode (sioc:num_replies).');

+++ b/core/modules/rdf/rdf.module
@@ -317,32 +317,12 @@ function rdf_preprocess_node(&$variables) {
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
old mode 100644
new mode 100755

this needs to go

Thanks for your work cwells. Great to see the logic being streamlined and special case handling code being removed in favor or one single code flow.

didn't mean to assign this issue.

not sure why PIFR believes the last patch is #4. The last patch is #7 and is green.

alright, let's get this in D7 now. This is similar to this backport: #1323830: Place title RDFa metadata inside entity HTML element.

This patch looks good so far except that it should be removing the code following

// Annotates the 'x comments' link in teaser view.

as well, similar to #7. (don't forget to also generalize the condition that adds that markup to cover both full and teaser view modes). Some tests will also most like need to be updated.

Looks like we have some changes from the comment module which shouldn't be in there...

Did you mean to add those weird comment.module hunks back in?

+++ b/modules/rdf/rdf.module
@@ -511,35 +511,21 @@ function rdf_preprocess_node(&$variables) {
+      'about' => $variables['node_url'],

The about is not needed in this case. That's the same reason as #1323830-21: Place title RDFa metadata inside entity HTML element.

Also, feel free to jam it all up into a nest statement like the last patch of #1323830: Place title RDFa metadata inside entity HTML element, for consistency.

+++ b/modules/rdf/rdf.test
@@ -461,15 +461,13 @@ class RdfCommentAttributesTestCase extends CommentHelperCase {
-    $this->drupalGet('node/' . $this->node1->nid);
-    $node_url = url('node/' . $this->node1->nid);
-    $comment_count_teaser = $this->xpath('/html/head/meta[@about=:node-url and @property="sioc:num_replies" and @content="2" and @datatype="xsd:integer"]', array(':node-url' => $node_url));
+    $this->drupalGet($node_url);

This line is wrong and is causing the tests to fail. drupalGet() will run its own url() on the value (e.g. node/1), so we shouldn't pass in a value such as $node_url which has already been passed through url(). Just use $this->drupalGet('node/' . $this->node1->nid); like it was before.

+++ b/modules/rdf/rdf.module
@@ -511,35 +511,21 @@ function rdf_preprocess_node(&$variables) {
+  if (isset($variables['node']->comment_count) &&
+      !empty($variables['node']->rdf_mapping['comment_count']['predicates']) &&
+      user_access('access comments')) {
+    // Adds RDFa markup for the comment count near the node title as metadata.
+    $element = array(
+      '#theme' => 'rdf_metadata',
+      '#metadata' => array(
+        array(
           'property' => $variables['node']->rdf_mapping['comment_count']['predicates'],
           'content' => $variables['node']->comment_count,
           'datatype' => $variables['node']->rdf_mapping['comment_count']['datatype'],
         ),
-      );
-      drupal_add_html_head($element, 'rdf_node_comment_count');
-    }
+      ),
+    );
+    $variables['title_suffix']['rdf_meta_comment_count'] = $element;

We could even remove the $element variable altogether.

This is good to go and get committed right after #2301955: Ensure RDFa metadata tags are hidden. Since those patches are touching different parts of rdf.module, no reroll is necessary.