lost comment boxes on status.net conversations

diff --git a/boot.php b/boot.php
index 72d36dac47afe39ee93495fc2757bc5170e9cc71..6479868b3b024836f5a1e3edff649d32a57a4146 100644 (file)
--- 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 1558a5c41b569b07fcfd3c1ead4518b1a043eea3..7c30c01c2b2d98f8a76c56aa9e4979e5490e5a39 100644 (file)
--- 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