diff options
| author | cash <cash.costello@gmail.com> | 2011-07-09 12:06:05 -0400 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2011-07-09 12:06:05 -0400 |
| commit | 7a163a886170aa436807f24590dd6c48503ed970 (patch) | |
| tree | 05318c769ba831709097e675e8923d3b4100690b | |
| parent | c16bdb97aac98799b2de39e97696a684f5c50a21 (diff) | |
| download | elgg-7a163a886170aa436807f24590dd6c48503ed970.tar.gz elgg-7a163a886170aa436807f24590dd6c48503ed970.tar.bz2 | |
fixed redirect for user avatars if we cannot get the user
| -rw-r--r-- | engine/lib/users.php | 5 | ||||
| -rw-r--r-- | pages/avatar/view.php | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php index e7e1a57f0..48f10f974 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1383,7 +1383,10 @@ function elgg_profile_fields_setup() { function elgg_avatar_page_handler($page) { global $CONFIG; - set_input('username', $page[1]); + $user = get_user_by_username($page[1]); + if ($user) { + elgg_set_page_owner_guid($user->getGUID()); + } if ($page[0] == 'edit') { require_once("{$CONFIG->path}pages/avatar/edit.php"); diff --git a/pages/avatar/view.php b/pages/avatar/view.php index 55ae00e16..eb2cd1010 100644 --- a/pages/avatar/view.php +++ b/pages/avatar/view.php @@ -13,9 +13,9 @@ if (!in_array($size, array('master', 'large', 'medium', 'small', 'tiny', 'topbar // If user doesn't exist, return default icon if (!$user) { - $path = elgg_view("icon/user/default/$size"); - header("Location: $path"); - exit; + $url = "_graphics/icons/user/default{$size}"; + $url = elgg_normalize_url($url); + forward($url); } // Try and get the icon @@ -31,9 +31,9 @@ if ($filehandler->open("read")) { } if (!$success) { - $path = elgg_view('icon/user/default/'.$size); - header("Location: {$path}"); - exit; + $url = "_graphics/icons/user/default{$size}"; + $url = elgg_normalize_url($url); + forward($url); } header("Content-type: image/jpeg"); |