Merge remote-tracking branch 'upstream/nightly' into nightly

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

diff --git a/lib/conversationnoticestream.php b/lib/conversationnoticestream.php
index 21b2d7f0be59a0561e6ecf1994cfcc7e89a451dd..bcb16c2d4b5a87a05773dcac134afe2b652d39a0 100644 (file)
--- a/lib/conversationnoticestream.php
+++ b/lib/conversationnoticestream.php
@@ -42,14 +42,10 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class ConversationNoticeStream extends ScopingNoticeStream
 {
-    function __construct($id, $profile = -1)
+    function __construct($id, Profile $scoped=null)
     {
-        if (is_int($profile) && $profile == -1) {
-            $profile = Profile::current();
-        }
-
         parent::__construct(new RawConversationNoticeStream($id),
-                            $profile);
+                            $scoped);
     }
 }