bug #65 'show all nn comments', 'show more posts like this' are misleading after...

diff --git a/boot.php b/boot.php
index e06e1574e284edea5ad257585fd51ebe871a8a3f..a44d8298fcf74a89486e7226a89420c8bdaaac8f 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.981' );
+define ( 'FRIENDIKA_VERSION',      '2.2.982' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1054      );
 

diff --git a/include/conversation.php b/include/conversation.php
index a58a4d63868357d0e3947dc67defe8732b0b5185..febd6c34755364f6d2e4342e010a9cabdb480a86 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -267,7 +267,7 @@ function conversation(&$a, $items, $mode, $update) {
                                        $blowhard_count ++;
                                        if($blowhard_count == 3) {
                                                $o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] 
-                                                       . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\');" >' 
+                                                       . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\'); $(\'#icollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
                                                        . t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' 
                                                        . $item['parent'] . '" style="display: none;" >';
                                        }
@@ -292,7 +292,7 @@ function conversation(&$a, $items, $mode, $update) {
                        if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
                                if(! $comments_collapsed) {
                                        $o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] 
-                                               . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' 
+                                               . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\'); $(\'#ccollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
                                                . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>'
                                                . '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
                                        $comments_collapsed = true;