Some fix on forgotten or useless vars

diff --git a/object/Conversation.php b/object/Conversation.php
index ca2ed2bb82f7f574e44fcfa43bfceb75b98bb664..634a09397234c0dd6769c1f6818255a626274a2f 100644 (file)
--- a/object/Conversation.php
+++ b/object/Conversation.php
@@ -50,6 +50,7 @@ class Conversation extends BaseObject {
                                return false;
                                break;
                }
+               $this->mode = $mode;
        }
 
        /**

diff --git a/object/Item.php b/object/Item.php
index 7aaec5c46a7ac31619d5c514585d52c6439a558c..5ed2e2e7467d169276bbfa95411a2e0e9d3adc88 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -59,8 +59,6 @@ class Item extends BaseObject {
                $isstarred = "unstarred";
                $indent = '';
                $osparkle = '';
-               $lastcollapsed = false;
-               $firstcollapsed = false;
                $total_children = $this->count_descendants();
 
                $conv = $this->get_conversation();
@@ -236,9 +234,6 @@ class Item extends BaseObject {
                $body = prepare_body($item,true);
 
                $tmp_item = array(
-                       // collapse comments in template. I don't like this much...
-                       'comment_firstcollapsed' => $firstcollapsed,
-                       'comment_lastcollapsed' => $lastcollapsed,
                        // template to use to render item (wall, walltowall, search)
                        'template' => $this->get_template(),