diff options
author | Evan Prodromou <evan@status.net> | 2009-11-07 22:26:14 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-07 22:26:14 -0500 |
commit | 46cd7b9636fcc53b3b62096d70af339789eb62aa (patch) | |
tree | f57839e3af9a141f349afa775499566409681553 | |
parent | ee99a8ef50a61a5a8d8b001c336536f23a855119 (diff) | |
parent | 1de9496c7fed16c2675c3d5136c131c07534c2cc (diff) |
Merge branch '0.9.x' into adminpanel
-rw-r--r-- | actions/deletenotice.php | 2 | ||||
-rw-r--r-- | lib/noticelist.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actions/deletenotice.php b/actions/deletenotice.php index 4a48a9c34..ba8e86d0f 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -67,7 +67,7 @@ class DeletenoticeAction extends Action common_user_error(_('Not logged in.')); exit; } else if ($this->notice->profile_id != $this->user_profile->id && - !$this->user->hasRight(Right::deleteOthersNotice)) { + !$this->user->hasRight(Right::DELETEOTHERSNOTICE)) { common_user_error(_('Can\'t delete this notice.')); exit; } diff --git a/lib/noticelist.php b/lib/noticelist.php index 8b3015cc3..bf12bb73c 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -513,7 +513,7 @@ class NoticeListItem extends Widget $user = common_current_user(); if (!empty($user) && - ($this->notice->profile_id == $user->id || $user->hasRight(Right::deleteOthersNotice))) { + ($this->notice->profile_id == $user->id || $user->hasRight(Right::DELETEOTHERSNOTICE))) { $deleteurl = common_local_url('deletenotice', array('notice' => $this->notice->id)); |