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

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

diff --git a/lib/replynoticestream.php b/lib/replynoticestream.php
index 9eb188d54db2d43d0105a4ea48d2b395b911f64d..d6b2882193c9266a0bc5477d0b6d9a0a0da669e5 100644 (file)
--- a/lib/replynoticestream.php
+++ b/lib/replynoticestream.php
@@ -43,14 +43,11 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class ReplyNoticeStream extends ScopingNoticeStream
 {
-    function __construct($userId, $profile=-1)
+    function __construct($userId, Profile $scoped=null)
     {
-        if (is_int($profile) && $profile == -1) {
-            $profile = Profile::current();
-        }
         parent::__construct(new CachingNoticeStream(new RawReplyNoticeStream($userId),
                                                     'reply:stream:' . $userId),
-                            $profile);
+                            $scoped);
     }
 }