aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-05-03 18:05:11 -0700
committerFriendika <info@friendika.com>2011-05-03 18:05:11 -0700
commit64a7d0b578ae3264eb65bd4ad1c20a38d63cf3bf (patch)
tree83be367bfcebb891946a503f18373f39cdf8be7d
parent6c1d587ae3609fbf9670786b9ce807d104fe774d (diff)
downloadvolse-hubzilla-64a7d0b578ae3264eb65bd4ad1c20a38d63cf3bf.tar.gz
volse-hubzilla-64a7d0b578ae3264eb65bd4ad1c20a38d63cf3bf.tar.bz2
volse-hubzilla-64a7d0b578ae3264eb65bd4ad1c20a38d63cf3bf.zip
lost comment boxes on status.net conversations
-rw-r--r--boot.php2
-rw-r--r--include/conversation.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 72d36dac4..6479868b3 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 1558a5c41..7c30c01c2 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