diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-02-06 15:38:10 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-02-06 15:38:10 -0500 |
| commit | 02d7167906b63d490db3b5c3848accc5235b220f (patch) | |
| tree | 92323dec8d456fdc737ee3a74c48dedf4cb92bcd /lib/mailbox.php | |
| parent | d260d841ebae71acf7bf726f52acaa6391ce1824 (diff) | |
| parent | 60f737dc1eb2f126bae28ce095bc2d17a22bd7d9 (diff) | |
Merge branch '0.7.x' into 0.8.x
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, |