diff options
| author | Sean Murphy <sgmurphy@gmail.com> | 2009-02-07 11:02:10 -0500 |
|---|---|---|
| committer | Sean Murphy <sgmurphy@gmail.com> | 2009-02-07 11:02:10 -0500 |
| commit | a3d5e00f64b3c166e34a8d36fcb4f5b757394e9b (patch) | |
| tree | 91576e428997bc6cc826fa2cead37794961de23c /lib/mailbox.php | |
| parent | d90089314944ed1696f66cabbb6935ea61e4b2e6 (diff) | |
| parent | 08db50b24eaf9e6e5f651448c394f1f50dd2409b (diff) | |
Merge commit 'upstream/0.7.x' into 0.7.x
Conflicts:
actions/showstream.php
Diffstat (limited to 'lib/mailbox.php')
| -rw-r--r-- | lib/mailbox.php | 6 |
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, |