GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Brion Vibber 2009-10-29 15:09:24 -04:00
parent 666c18a1dd c911c66fe1
commit 69907804af
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
actions/showstream.php
View File

@ -348,6 +348,8 @@ class ShowstreamAction extends ProfileAction
{ {
if (Event::handle('StartProfilePageActionsSection', array(&$this, $this->profile))) { if (Event::handle('StartProfilePageActionsSection', array(&$this, $this->profile))) {
$cur = common_current_user();
$this->elementStart('div', 'entity_actions'); $this->elementStart('div', 'entity_actions');
$this->element('h2', null, _('User actions')); $this->element('h2', null, _('User actions'));
$this->elementStart('ul'); $this->elementStart('ul');
@ -379,21 +381,21 @@ class ShowstreamAction extends ProfileAction
} }
$this->elementEnd('li'); $this->elementEnd('li');
if ($cur->mutuallySubscribed($user)) { if ($cur->mutuallySubscribed($this->user)) {
// message // message
$this->elementStart('li', 'entity_send-a-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')), 'title' => _('Send a direct message to this user')),
_('Message')); _('Message'));
$this->elementEnd('li'); $this->elementEnd('li');
// nudge // nudge
if ($user->email && $user->emailnotifynudge) { if ($this->user->email && $this->user->emailnotifynudge) {
$this->elementStart('li', 'entity_nudge'); $this->elementStart('li', 'entity_nudge');
$nf = new NudgeForm($this, $user); $nf = new NudgeForm($this, $this->user);
$nf->show(); $nf->show();
$this->elementEnd('li'); $this->elementEnd('li');
} }