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

Those variables were set for a reason 

The ->_subscription variable etc. were set because they were used later.
This commit is contained in:
Mikael Nordfeldth 2015-01-13 12:56:56 +01:00
parent 3927acdde5
commit bc51c6b64f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/atompubshowmembership.php
View File

@ -67,7 +67,7 @@ class AtompubshowmembershipAction extends AtompubAction
$this->_membership = Group_member::pkeyGet($kv);
if (!$this->_profile->isMembmer($this->_group)) {
if (!$this->_membership instanceof Group_member) {
// TRANS: Client exception thrown when trying to show membership of a non-subscribed group
throw new ClientException(_('Not a member.'), 404);
}

4
actions/atompubshowsubscription.php
View File

@ -70,7 +70,9 @@ class AtompubshowsubscriptionAction extends AtompubAction
$subscribedId), 404);
}
if (!$this->_subscriber->isSubscribed($this->_subscribed)) {
$this->_subscription = Subscription::pkeyGet(array('subscriber' => $subscriberId,
'subscribed' => $subscribedId));
if (!$this->_subscription instanceof Subscription) {
// TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
// TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
$msg = sprintf(_('Profile %1$d not subscribed to profile %2$d.'),