X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fscopingnoticestream.php;h=30b80f10e57569866d4b50518a0ec61078e1058b;hb=22e50ad7bbdef7d77172a1e892a6952ca9f26d77;hp=a7ecbcd56ba8c34f44251317e28a93309edce8a6;hpb=e0d5093ee58f921385eba533adb3f0d21dcf3b49;p=quix0rs-gnu-social.git diff --git a/lib/scopingnoticestream.php b/lib/scopingnoticestream.php index a7ecbcd56b..30b80f10e5 100644 --- a/lib/scopingnoticestream.php +++ b/lib/scopingnoticestream.php @@ -49,16 +49,15 @@ class ScopingNoticeStream extends FilteringNoticeStream { protected $profile; - function __construct($upstream, $profile = null) + function __construct($upstream, $profile = -1) { parent::__construct($upstream); - if (empty($profile)) { - $user = common_current_user(); - if (!empty($user)) { - $profile = $user->getProfile(); - } + // Invalid but not null + if (is_int($profile) && $profile == -1) { + $profile = Profile::current(); } + $this->profile = $profile; } @@ -74,5 +73,4 @@ class ScopingNoticeStream extends FilteringNoticeStream { return $notice->inScope($this->profile); } - }