diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/conversation.php | 2 | ||||
| -rw-r--r-- | actions/subscriptions.php | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/actions/conversation.php b/actions/conversation.php index cd6f26329..468409189 100644 --- a/actions/conversation.php +++ b/actions/conversation.php @@ -107,7 +107,7 @@ class ConversationAction extends Action function showContent() { - $notices = Notice::conversationStream($this->id, 0, null); + $notices = Notice::conversationStream($this->id, null); $ct = new ConversationTree($notices, $this); diff --git a/actions/subscriptions.php b/actions/subscriptions.php index 4124abea4..42bdae10f 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -159,7 +159,10 @@ class SubscriptionsListItem extends SubscriptionListItem $this->showBio(); $this->showTags(); // Relevant portion! - $this->showOwnerControls(); + $cur = common_current_user(); + if (!empty($cur) && $cur->id == $this->owner->id) { + $this->showOwnerControls(); + } $this->endProfile(); } |