diff options
| author | Brion Vibber <brion@pobox.com> | 2009-10-29 15:09:24 -0400 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2009-10-29 15:09:24 -0400 |
| commit | 69907804afa08e876d21283dd430fcd3427ef428 (patch) | |
| tree | bb19ed0f654c6623480e8068af4a829ddc2c7a41 | |
| parent | 666c18a1dd79ed46fdab8c12d7061ad640c33a50 (diff) | |
| parent | c911c66fe1ddb9fcea4a1817496f2efaffe26a98 (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
| -rw-r--r-- | actions/showstream.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/actions/showstream.php b/actions/showstream.php index b3a9b1f05..de7100b1d 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -348,6 +348,8 @@ class ShowstreamAction extends ProfileAction { if (Event::handle('StartProfilePageActionsSection', array(&$this, $this->profile))) { + $cur = common_current_user(); + $this->elementStart('div', 'entity_actions'); $this->element('h2', null, _('User actions')); $this->elementStart('ul'); @@ -379,21 +381,21 @@ class ShowstreamAction extends ProfileAction } $this->elementEnd('li'); - if ($cur->mutuallySubscribed($user)) { + if ($cur->mutuallySubscribed($this->user)) { // message $this->elementStart('li', 'entity_send-a-message'); - $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)), + $this->element('a', array('href' => common_local_url('newmessage', array('to' => $this->user->id)), 'title' => _('Send a direct message to this user')), _('Message')); $this->elementEnd('li'); // nudge - if ($user->email && $user->emailnotifynudge) { + if ($this->user->email && $this->user->emailnotifynudge) { $this->elementStart('li', 'entity_nudge'); - $nf = new NudgeForm($this, $user); + $nf = new NudgeForm($this, $this->user); $nf->show(); $this->elementEnd('li'); } |