summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorSean Murphy <sgmurphy@gmail.com>2009-02-06 18:36:34 -0500
committerSean Murphy <sgmurphy@gmail.com>2009-02-06 18:36:34 -0500
commitd6245dca6347a670445701e9c726b0719ea945c8 (patch)
tree8d23b898e52e43716d891f92f765677e81a7e317 /actions
parent56d7348ec2ce6750aed73659a4889f22d31f61c8 (diff)
Fixed #1048: Edit avatar link on profile page.
Diffstat (limited to 'actions')
-rw-r--r--actions/showstream.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index eab1fc0a2..3b4c97865 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -245,6 +245,15 @@ class ShowstreamAction extends Action
'height' => AVATAR_PROFILE_SIZE,
'alt' => $this->profile->nickname));
$this->elementEnd('dd');
+
+ $user = User::staticGet('id', $this->profile->id);
+ $cur = common_current_user();
+ if ($cur && $cur->id == $user->id) {
+ $this->elementStart('dd');
+ $this->element('a', array('href' => common_local_url('avatarsettings')), _('Edit Avatar'));
+ $this->elementEnd('dd');
+ }
+
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_nickname');
@@ -317,7 +326,6 @@ class ShowstreamAction extends Action
$this->element('h2', null, _('User actions'));
$this->elementStart('ul');
$this->elementStart('li', array('class' => 'entity_subscribe'));
- $cur = common_current_user();
if ($cur) {
if ($cur->id != $this->profile->id) {
if ($cur->isSubscribed($this->profile)) {
@@ -335,7 +343,6 @@ class ShowstreamAction extends Action
// 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('class' => 'entity_send-a-message'));
$this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)),