GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[CORE] Fix subscription-related functions from the Profile class

Browse Source 
The undifined variable $private_stream, from the User class, was causing
undifined behavior from calling requiresSubscriptionApproval. The is_null
test was added to fix this problem.
This commit is contained in:
tenma 2019-08-12 04:53:43 +01:00 committed by Diogo Cordeiro
parent bff525d26f
commit 357296baeb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
classes/Profile.php
View File

@ -793,7 +793,7 @@ class Profile extends Managed_DataObject
return is_null($other) ? false : $other->isSubscribed($this); return is_null($other) ? false : $other->isSubscribed($this);
} }
function requiresSubscriptionApproval(Profile $other=null) function requiresSubscriptionApproval(Profile $other=null): bool
{ {
if (!$this->isLocal()) { if (!$this->isLocal()) {
// We don't know for remote users, and we'll always be able to send // We don't know for remote users, and we'll always be able to send
@ -809,7 +809,7 @@ class Profile extends Managed_DataObject
// If the local user either has a private stream (implies the following) // If the local user either has a private stream (implies the following)
// or user has a moderation policy for new subscriptions, return true. // or user has a moderation policy for new subscriptions, return true.
return $this->getUser()->private_stream || $this->getUser()->subscribe_policy === User::SUBSCRIBE_POLICY_MODERATE; return $this->isPrivateStream() || $this->getUser()->subscribe_policy === User::SUBSCRIBE_POLICY_MODERATE;
} }
/** /**
@ -1792,13 +1792,14 @@ class Profile extends Managed_DataObject
return $this->getUser()->shortenLinks($text, $always); return $this->getUser()->shortenLinks($text, $always);
} }
public function isPrivateStream() public function isPrivateStream(): bool
{ {
// We only know of public remote users as of yet... // We only know of public remote users as of yet...
if (!$this->isLocal()) { if (!$this->isLocal()) {
return false; return false;
} }
return $this->getUser()->private_stream ? true : false; $private_stream = $this->getUser()->private_stream;
return !is_null($private_stream) && $private_stream;
} }
public function delPref($namespace, $topic) { public function delPref($namespace, $topic) {