use -1 for invalid arg default in ScopingNoticeStream
This commit is contained in:
parent
f9a91a2809
commit
bae9eacaa1
@ -49,16 +49,15 @@ class ScopingNoticeStream extends FilteringNoticeStream
|
|||||||
{
|
{
|
||||||
protected $profile;
|
protected $profile;
|
||||||
|
|
||||||
function __construct($upstream, $profile = null)
|
function __construct($upstream, $profile = -1)
|
||||||
{
|
{
|
||||||
parent::__construct($upstream);
|
parent::__construct($upstream);
|
||||||
|
|
||||||
if (empty($profile)) {
|
// Invalid but not null
|
||||||
$user = common_current_user();
|
if (is_int($profile) && $profile == -1) {
|
||||||
if (!empty($user)) {
|
$profile = Profile::current();
|
||||||
$profile = $user->getProfile();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->profile = $profile;
|
$this->profile = $profile;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,5 +73,4 @@ class ScopingNoticeStream extends FilteringNoticeStream
|
|||||||
{
|
{
|
||||||
return $notice->inScope($this->profile);
|
return $notice->inScope($this->profile);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user