summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-rw-r--r--actions/nudge.php2
-rw-r--r--actions/showstream.php21
2 files changed, 20 insertions, 3 deletions
diff --git a/actions/nudge.php b/actions/nudge.php
index bb80ce357..456106459 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -88,7 +88,7 @@ class NudgeAction extends Action
$this->notify($user, $other);
if ($this->boolean('ajax')) {
- common_start_html('text/xml;charset=utf-8', true);
+ $this->startHTML('text/xml;charset=utf-8', true);
$this->elementStart('head');
$this->element('title', null, _('Nudge sent'));
$this->elementEnd('head');
diff --git a/actions/showstream.php b/actions/showstream.php
index 3882af845..a411fae5b 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -326,7 +326,24 @@ class ShowstreamAction extends Action
}
$this->elementEnd('li');
- common_profile_new_message_nudge($cur, $this->user, $this->profile);
+// common_profile_new_message_nudge($cur, $this->user, $this->profile);
+
+ $user = User::staticGet('id', $this->profile->id);
+ if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
+ $this->elementStart('li', array('id' => 'user_send_a_new_message'));
+ $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))),
+ _('Send a message'));
+ $this->elementEnd('li');
+
+ if ($user->email && $user->emailnotifynudge) {
+ $this->elementStart('li', array('id' => 'user_nudge'));
+ $nf = new NudgeForm($this, $user);
+ $nf->show();
+ $this->elementEnd('li');
+ }
+ }
+
+
if ($cur && $cur->id != $this->profile->id) {
$blocked = $cur->hasBlocked($this->profile);
@@ -349,7 +366,7 @@ class ShowstreamAction extends Action
$url = common_local_url('remotesubscribe',
array('nickname' => $this->profile->nickname));
$this->element('a', array('href' => $url,
- 'id' => 'remotesubscribe'),
+ 'id' => 'user_subscribe_remote'),
_('Subscribe'));
}