wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ensureProfile already done and stored in $this->oprofile

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-01-12 02:01:26 +01:00
parent d8f4de450c
commit 73669ed308
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/OStatus/actions/groupsalmon.php
View File

@ -88,7 +88,6 @@ class GroupsalmonAction extends SalmonAction
} }
} }
$profile = $this->ensureProfile();
$this->saveNotice(); $this->saveNotice();
} }
@ -153,7 +152,6 @@ class GroupsalmonAction extends SalmonAction
*/ */
function handleLeave() function handleLeave()
{ {
// ensureProfile throws exception on failure
if ($this->oprofile->isGroup()) { if ($this->oprofile->isGroup()) {
// TRANS: Client error displayed when trying to have a group join another group. // TRANS: Client error displayed when trying to have a group join another group.
throw new AlreadyFulfilledException(_m('Groups cannot be members of groups')); throw new AlreadyFulfilledException(_m('Groups cannot be members of groups'));

3
plugins/OStatus/lib/salmonaction.php
View File

@ -264,7 +264,6 @@ class SalmonAction extends Action
function saveNotice() function saveNotice()
{ {
$oprofile = $this->ensureProfile(); return $this->oprofile->processPost($this->activity, 'salmon');
return $oprofile->processPost($this->activity, 'salmon');
} }
} }