From 64a7d0b578ae3264eb65bd4ad1c20a38d63cf3bf Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 3 May 2011 18:05:11 -0700
Subject: [PATCH] lost comment boxes on status.net conversations

---
 boot.php                 | 2 +-
 include/conversation.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index 72d36dac47..6479868b3b 100644
--- a/boot.php
+++ b/boot.php
@@ -2,7 +2,7 @@
 
 set_time_limit(0);
 
-define ( 'FRIENDIKA_VERSION',      '2.1.967' );
+define ( 'FRIENDIKA_VERSION',      '2.1.968' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1054      );
 
diff --git a/include/conversation.php b/include/conversation.php
index 1558a5c41b..7c30c01c2b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -225,7 +225,7 @@ function conversation(&$a, $items, $mode, $update) {
 
 		$comments = array();
 		foreach($items as $item) {
-			if(intval($item['gravity']) == 6) {
+			if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
 				if(! x($comments,$item['parent']))
 					$comments[$item['parent']] = 1;
 				else