Merge branch '0.9.x' into adminpanel
This commit is contained in:
commit
46cd7b9636
@ -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;
|
||||
}
|
||||
|
@ -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));
|
||||
|
Loading…
Reference in New Issue
Block a user