commit 5830be3bff5be21093d9d326815b60977410abac
Author: fago <nuppla@zites.net>
Date:   Mon Oct 29 15:10:02 2012 +0100

    Added in fixes for threading.

diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index f01a3f8..a31aec0 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1675,16 +1675,17 @@ function template_preprocess_comment(&$variables) {
   $variables['permalink'] = l(t('Permalink'), $uri['path'], $uri['options']);
   $variables['submitted'] = t('Submitted by !username on !datetime', array('!username' => $variables['author'], '!datetime' => $variables['created']));
 
-  if ($comment->pid > 0) {
+  if ($comment->pid->value) {
     // Fetch and store the parent comment information for use in templates.
-    $comment_parent = comment_load($comment->pid);
+    $comment_parent = $comment->pid->entity;
+    $account_parent = comment_prepare_author($comment);
     $variables['parent_comment'] = $comment_parent;
-    $variables['parent_author'] = theme('username', array('account' => $comment_parent));
-    $variables['parent_created'] = format_date($comment_parent->created);
-    $variables['parent_changed'] = format_date($comment_parent->changed);
+    $variables['parent_author'] = theme('username', array('account' => $account_parent));
+    $variables['parent_created'] = format_date($comment_parent->created->value->getTimestamp());
+    $variables['parent_changed'] = format_date($comment_parent->changed->value->getTimestamp());
     $uri_parent = $comment_parent->uri();
     $uri_parent['options'] += array('attributes' => array('class' => 'permalink', 'rel' => 'bookmark'));
-    $variables['parent_title'] = l($comment_parent->subject, $uri_parent['path'], $uri_parent['options']);
+    $variables['parent_title'] = l($comment_parent->subject->value, $uri_parent['path'], $uri_parent['options']);
     $variables['parent_permalink'] = l(t('Parent permalink'), $uri_parent['path'], $uri_parent['options']);
     $variables['parent'] = t('In reply to !parent_title by !parent_username',
         array('!parent_username' => $variables['parent_author'], '!parent_title' => $variables['parent_title']));
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
index 9ab368b..682cf51 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
@@ -50,7 +50,7 @@ function testCommentThreading() {
 
     // Reply to comment #1 creating comment #2.
     $this->drupalLogin($this->web_user);
-    $this->drupalGet('comment/reply/' . $this->node->nid . '/' . $comment1->id);
+    $this->drupalGet('comment/reply/' . $this->node->nid . '/' . $comment1->id());
     $comment2 = $this->postComment(NULL, $this->randomName(), '', TRUE);
     // Confirm that the comment was created and has the correct threading.
     $comment2_loaded = comment_load($comment2->id());