diff options
author | Evan Prodromou <evan@status.net> | 2010-10-12 11:16:14 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-10-12 11:16:14 -0400 |
commit | f11c1c77cab7d7310ec0d2c17bc6f35c491f2871 (patch) | |
tree | 7d0741b5d1b68cfbfa21ed974abab04e7b721b0b /actions | |
parent | 1e3d5f80258811ce1c2154fcd971297e24264894 (diff) | |
parent | 1cd60579f5ac99a2c8bfb12d35093f5c74f14b04 (diff) |
Merge remote branch 'gitorious/0.9.x' into 0.9.x
Diffstat (limited to 'actions')
-rw-r--r-- | actions/deletenotice.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/actions/deletenotice.php b/actions/deletenotice.php index 68c43040b..2879faa5d 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -45,6 +45,12 @@ class DeletenoticeAction extends Action parent::prepare($args); $this->user = common_current_user(); + + if (!$this->user) { + common_user_error(_('Not logged in.')); + exit; + } + $notice_id = $this->trimmed('notice'); $this->notice = Notice::staticGet($notice_id); @@ -63,10 +69,7 @@ class DeletenoticeAction extends Action { parent::handle($args); - if (!common_logged_in()) { - common_user_error(_('Not logged in.')); - exit; - } else if ($this->notice->profile_id != $this->user_profile->id && + if ($this->notice->profile_id != $this->user_profile->id && !$this->user->hasRight(Right::DELETEOTHERSNOTICE)) { common_user_error(_('Can\'t delete this notice.')); exit; |