From 5b374c4050c85151e18a0089fd990052f1185436 Mon Sep 17 00:00:00 2001
From: Domovoy <domovoy@errlock.org>
Date: Sun, 5 Aug 2012 19:30:21 +0200
Subject: [PATCH] Diaspora doesn't support threaded comments (forgot some)

---
 include/diaspora.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/diaspora.php b/include/diaspora.php
index 0b2add337f..96b0b184e0 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2333,13 +2333,13 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 	$body = $item['body'];
 	$text = html_entity_decode(bb2diaspora($body));
 
-
-	if($item['thr-parent']) {
+	// Diaspora doesn't support threaded comments
+	/*if($item['thr-parent']) {
 		$p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1",
 		        dbesc($item['thr-parent'])
 		      );
 	}
-	else {
+	else {*/
 		// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
 		// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
 		// The only item with `parent` and `id` as the parent id is the parent item.
@@ -2347,7 +2347,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 			intval($item['parent']),
 			intval($item['parent'])
 		      );
-	}
+	//}
 	if(count($p))
 		$parent = $p[0];
 	else