summaryrefslogtreecommitdiff
path: root/lib/noticelist.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-10-04 16:16:52 -0700
committerBrion Vibber <brion@pobox.com>2009-10-04 16:16:52 -0700
commit4462a1c63600fa83d2692ac2de8067b12b1eeac9 (patch)
treea946b98184eb32b5be4bf64e67357c06e8d0f65d /lib/noticelist.php
parent9235c1437e542d2b565d2d2d36fe2b7561e4d5f7 (diff)
parent2f065d687dc76bfbac3e1b7b3dcccf544f4b4987 (diff)
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/noticelist.php')
-rw-r--r--lib/noticelist.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/noticelist.php b/lib/noticelist.php
index c2ff7c26b..6c296f82a 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -472,7 +472,10 @@ class NoticeListItem extends Widget
function showDeleteLink()
{
$user = common_current_user();
- if ($user && $this->notice->profile_id == $user->id) {
+
+ if (!empty($user) &&
+ ($this->notice->profile_id == $user->id || $user->hasRight(Right::deleteOthersNotice))) {
+
$deleteurl = common_local_url('deletenotice',
array('notice' => $this->notice->id));
$this->out->element('a', array('href' => $deleteurl,