diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php index 6f2837a..3efe358 100644 --- a/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php +++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php @@ -130,10 +130,10 @@ protected function assertParentLink($cid, $pid) { // //
//

- // + // //

//
- $pattern = "//a[@id='comment-$cid']/following-sibling::article//p[contains(@class, 'parent')]//a[contains(@href, 'comment-$pid')]"; + $pattern = "//a[@id='comment-$cid']/following-sibling::article//p[contains(@class, 'parent')]//a[contains(@href, 'comment/$pid')]"; $this->assertFieldByXpath($pattern, NULL, format_string( 'Comment %cid has a link to parent %pid.', diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php index dbdba31..b0cb999 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php @@ -135,11 +135,11 @@ public function testCommentReplyOfRdfaMarkup() { $this->drupalLogin($this->web_user); $comment_1 = $this->saveComment($this->node->nid, $this->web_user->uid); - $comment_1_uri = url('comment/' . $comment_1->id(), array('fragment' => 'comment-' . $comment_1->id(), 'absolute' => TRUE)); + $comment_1_uri = url('comment/' . $comment_1->id(), array('absolute' => TRUE)); // Posts a reply to the first comment. $comment_2 = $this->saveComment($this->node->nid, $this->web_user->uid, NULL, $comment_1->id()); - $comment_2_uri = url('comment/' . $comment_2->id(), array('fragment' => 'comment-' . $comment_2->id(), 'absolute' => TRUE)); + $comment_2_uri = url('comment/' . $comment_2->id(), array('absolute' => TRUE)); $parser = new \EasyRdf_Parser_Rdfa(); $graph = new \EasyRdf_Graph(); @@ -176,7 +176,7 @@ public function testCommentReplyOfRdfaMarkup() { * An array containing information about an anonymous user. */ function _testBasicCommentRdfaMarkup($graph, $comment, $account = array()) { - $comment_uri = url('comment/' . $comment->id(), array('fragment' => 'comment-' . $comment->id(), 'absolute' => TRUE)); + $comment_uri = url('comment/' . $comment->id(), array('absolute' => TRUE)); // Comment type. $expected_value = array( diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module index a2f74a3..93b1722 100644 --- a/core/modules/rdf/rdf.module +++ b/core/modules/rdf/rdf.module @@ -419,7 +419,7 @@ function rdf_comment_load($comments) { $comment->rdf_data['date'] = rdf_rdfa_attributes($comment->rdf_mapping['created'], $comment->created->value); $comment->rdf_data['nid_uri'] = url('node/' . $comment->nid->target_id); if ($comment->pid->target_id) { - $comment->rdf_data['pid_uri'] = url('comment/' . $comment->pid->target_id, array('fragment' => 'comment-' . $comment->pid->target_id)); + $comment->rdf_data['pid_uri'] = url('comment/' . $comment->pid->target_id); } } }