summaryrefslogtreecommitdiff
path: root/lib/mailbox.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/mailbox.php')
-rw-r--r--lib/mailbox.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/mailbox.php b/lib/mailbox.php
index 8d5d44e49..d77234549 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -63,6 +63,8 @@ class MailboxAction extends PersonalAction
$this->page = 1;
}
+ common_set_returnto($this->selfUrl());
+
return true;
}
@@ -181,8 +183,8 @@ class MailboxAction extends PersonalAction
'class' => 'url'));
$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
$this->element('img', array('src' => ($avatar) ?
- common_avatar_display_url($avatar) :
- common_default_avatar(AVATAR_STREAM_SIZE),
+ $avatar->displayUrl() :
+ Avatar::defaultImage(AVATAR_STREAM_SIZE),
'class' => 'photo avatar',
'width' => AVATAR_STREAM_SIZE,
'height' => AVATAR_STREAM_SIZE,