better output for registration confirmation

[quix0rs-gnu-social.git] / lib / conversationnoticestream.php

diff --git a/lib/conversationnoticestream.php b/lib/conversationnoticestream.php
index 78ba3a372d0d06660b467b61e4d59c9d08cdda0f..66075db84f436a62c095174f0036b8231fddf4a5 100644 (file)
--- a/lib/conversationnoticestream.php
+++ b/lib/conversationnoticestream.php
@@ -46,10 +46,15 @@ if (!defined('STATUSNET')) {
  */
 class ConversationNoticeStream extends ScopingNoticeStream
 {
-    function __construct($id)
+    function __construct($id, $profile = -1)
     {
+        if (is_int($profile) && $profile == -1) {
+            $profile = Profile::current();
+        }
+
         parent::__construct(new CachingNoticeStream(new RawConversationNoticeStream($id),
-                                                    'notice:conversation_ids:'.$id));
+                                                    'notice:conversation_ids:'.$id),
+                            $profile);
     }
 }
 
@@ -98,9 +103,6 @@ class RawConversationNoticeStream extends NoticeStream
             }
         }
 
-        $notice->free();
-        $notice = NULL;
-
         return $ids;
     }
 }
\ No newline at end of file