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

nudge: only show it when other person has enabled it. 

darcs-hash:20081117154147-099f7-cf844aabcc3866eaf42312050a959dbc7cb10ed9.gz
This commit is contained in:
millette 2008-11-17 10:41:47 -05:00
parent f71f2d5ba8
commit 87d0235b54
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actions/nudge.php
View File

@ -36,7 +36,7 @@ class NudgeAction extends Action {
$other = User::staticGet('nickname', $other_nickname);
$this->notify($user, $other);
if (true || $this->boolean('ajax')) {
if ($this->boolean('ajax')) {
common_start_html('text/xml');
common_element_start('head');
common_element('title', null, _('Nudge sent'));
@ -46,8 +46,9 @@ class NudgeAction extends Action {
common_element_end('body');
common_element_end('html');
} else {
common_redirect(common_local_url('nudge',
array('nickname' => $user->nickname)));
// display a confirmation to the user
common_redirect(common_local_url('showstream',
array('nickname' => $other->nickname)));
}
}

8
actions/showstream.php
View File

@ -191,9 +191,11 @@ class ShowstreamAction extends StreamAction {
common_element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))),
_('Send a message'));
common_element_end('li');
common_element_start('li', array('id' => 'profile_nudge'));
common_nudge_form($user);
common_element_end('li');
if ($user->email && $user->emailnotifynudge) {
common_element_start('li', array('id' => 'profile_nudge'));
common_nudge_form($user);
common_element_end('li');
}
}
common_element_end('ul');