--- -	2004-09-17 13:52:18.050562000 -0500
+++ ./lib/MT/Comment.pm	2004-09-17 13:37:31.000000000 -0500
@@ -11,7 +11,9 @@
 __PACKAGE__->install_properties({
     columns => [
         'id', 'blog_id', 'entry_id', 'author', 'commenter_id', 
-	'visible', 'email', 'url', 'text', 'ip',
+        # +ThreadedComments
+        'visible', 'email', 'url', 'text', 'ip', 'subject', 'parent_id',
+        # -ThreadedComments
     ],
     indexes => {
 	ip => 1,
@@ -21,6 +23,9 @@
 	email => 1,
 	commenter_id => 1,
 	visible => 1,
+        # +ThreadedComments
+        parent_id => 1,
+        # -ThreadedComments
     },
     audit => 1,
     datasource => 'comment',
--- -	2004-09-17 13:54:34.791406000 -0500
+++ ./lib/MT/App/Comments.pm	2004-09-17 13:38:46.000000000 -0500
@@ -418,6 +418,10 @@
     $comment->email(remove_html($email));
     $comment->url(MT::Util::is_valid_url($url, 'stringent'));
     $comment->text($q->param('text'));
+    # +ThreadedComments
+    $comment->subject($q->param('subject'));
+    $comment->parent_id($q->param('parent_id'));
+    # -ThreadedComments
     
     return ($comment, $commenter);
 }
@@ -461,6 +465,9 @@
                       (comment_email => $comment->email):()),
                      comment_url => $comment->url,
                      comment_text => $comment->text,
+                     # +ThreadedComments
+                     comment_subject => $comment->subject,
+                     # -ThreadedComments
                      unapproved => !$comment->visible(),
                     );
         my $body = MT->build_email('new-comment.tmpl', \%param);
@@ -818,6 +825,9 @@
     my $ctx = MT::Template::Context->new;
     $ctx->stash('entry', $entry);
     $ctx->stash('commenter', $cmntr) if ($cmntr);
+    # +ThreadedComments
+    $ctx->stash('comment_parent_id', $q->param('parent_id'));
+    # -ThreadedComments
     $ctx->{current_timestamp} = $entry->created_on;
     my %cond = (
         EntryIfExtended => $entry->text_more ? 1 : 0,