From 2a1657e3617faff8964e979a7a8482dfc0ec08d9 Mon Sep 17 00:00:00 2001
From: Domovoy <domovoy@errlock.org>
Date: Mon, 23 Jul 2012 13:58:47 +0200
Subject: [PATCH] Revert "Progress on #1. Comments are now threaded, at least
 in the database, for normal view."

This reverts commit da1b47a029e678aee8b99ee11eec972dfb9a1a2b.

Useless, comments are already threaded in the database using parent-uri
---
 include/conversation.php | 7 ++-----
 mod/item.php             | 5 ++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 67445c290..4a9142bb2 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -582,9 +582,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				}	
 
 				$override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
-				// The comment box should now appear under each writable item, not only at the end of the thread, don't bother with $comments_seen
-				//$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
-				$show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
+				$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
 
 
 				if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
@@ -683,13 +681,12 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					}
 
 					if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
-						// The parent is now the item itself, not his parent
 						$comment = replace_macros($cmnt_tpl,array(
 							'$return_path' => '', 
 							'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
 							'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
 							'$id' => $item['item_id'],
-							'$parent' => $item['item_id'],
+							'$parent' => $item['parent'],
 							'$qcomment' => $qcomment,
 							'$profile_uid' =>  $profile_owner,
 							'$mylink' => $a->contact['url'],
diff --git a/mod/item.php b/mod/item.php
index cc1e628c8..fddc3fd12 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -77,15 +77,14 @@ function item_post(&$a) {
 			);
 		}
 		// if this isn't the real parent of the conversation, find it
-		// We are now threading the comments, the parent may have a parent
-		/*if($r !== false && count($r)) {
+		if($r !== false && count($r)) {
 			$parid = $r[0]['parent'];
 			if($r[0]['id'] != $r[0]['parent']) {
 				$r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
 					intval($parid)
 				);
 			}
-		}*/
+		}
 
 		if(($r === false) || (! count($r))) {
 			notice( t('Unable to locate original post.') . EOL);