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

Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-02-28 19:19:46 +01:00
commit 781209a23b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/apistatusesdestroy.php
View File

@ -69,6 +69,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction
parent::prepare($args); parent::prepare($args);
$this->user = $this->auth_user; $this->user = $this->auth_user;
$this->profile = $this->auth_user->getProfile();
$this->notice_id = (int)$this->trimmed('id'); $this->notice_id = (int)$this->trimmed('id');
if (empty($notice_id)) { if (empty($notice_id)) {
@ -122,7 +123,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction
return; return;
} }
if ($this->user->id == $this->notice->profile_id) { if ($this->user->id == $this->notice->profile_id || $this->profile->hasRight(Right::DELETEOTHERSNOTICE)) {
if (Event::handle('StartDeleteOwnNotice', array($this->user, $this->notice))) { if (Event::handle('StartDeleteOwnNotice', array($this->user, $this->notice))) {
$this->notice->deleteAs($this->scoped); $this->notice->deleteAs($this->scoped);
Event::handle('EndDeleteOwnNotice', array($this->user, $this->notice)); Event::handle('EndDeleteOwnNotice', array($this->user, $this->notice));