diff options
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/avatar/view.php | 14 | ||||
| -rw-r--r-- | pages/friends/collections/add.php | 4 | ||||
| -rw-r--r-- | pages/friends/collections/pickercallback.php | 4 | ||||
| -rw-r--r-- | pages/friends/collections/view.php | 8 | ||||
| -rw-r--r-- | pages/friends/index.php | 4 | ||||
| -rw-r--r-- | pages/friends/of.php | 4 |
6 files changed, 21 insertions, 17 deletions
diff --git a/pages/avatar/view.php b/pages/avatar/view.php index eb2cd1010..904a57610 100644 --- a/pages/avatar/view.php +++ b/pages/avatar/view.php @@ -24,14 +24,20 @@ $filehandler->owner_guid = $user->getGUID(); $filehandler->setFilename("profile/" . $user->getGUID() . $size . ".jpg"); $success = false; -if ($filehandler->open("read")) { - if ($contents = $filehandler->read($filehandler->size())) { - $success = true; + +try { + if ($filehandler->open("read")) { + if ($contents = $filehandler->read($filehandler->size())) { + $success = true; + } } +} catch (InvalidParameterException $e) { + elgg_log("Unable to get profile icon for user with GUID $entity->guid", 'ERROR'); } + if (!$success) { - $url = "_graphics/icons/user/default{$size}"; + $url = "_graphics/icons/user/default{$size}.gif"; $url = elgg_normalize_url($url); forward($url); } diff --git a/pages/friends/collections/add.php b/pages/friends/collections/add.php index 0bc3f1fcb..60f7586ba 100644 --- a/pages/friends/collections/add.php +++ b/pages/friends/collections/add.php @@ -2,8 +2,8 @@ /** * Elgg add a collection of friends * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Social.Collections */ // You need to be logged in for this one diff --git a/pages/friends/collections/pickercallback.php b/pages/friends/collections/pickercallback.php index 228037590..c6ed61cf0 100644 --- a/pages/friends/collections/pickercallback.php +++ b/pages/friends/collections/pickercallback.php @@ -2,8 +2,8 @@ /** * Elgg friends picker callback * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Social.Collections */ // Load Elgg engine diff --git a/pages/friends/collections/view.php b/pages/friends/collections/view.php index fa7527f4d..0d72fe788 100644 --- a/pages/friends/collections/view.php +++ b/pages/friends/collections/view.php @@ -2,14 +2,12 @@ /** * Elgg collections of friends * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Social.Collections */ -// You need to be logged in for this one -gatekeeper(); - $title = elgg_echo('friends:collections'); +elgg_register_title_button('collections', 'add'); $content = elgg_view_access_collections(elgg_get_logged_in_user_guid()); diff --git a/pages/friends/index.php b/pages/friends/index.php index 84c0fa526..707402c64 100644 --- a/pages/friends/index.php +++ b/pages/friends/index.php @@ -2,8 +2,8 @@ /** * Elgg friends page * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Social.Friends */ $owner = elgg_get_page_owner_entity(); diff --git a/pages/friends/of.php b/pages/friends/of.php index 7091c4445..5bbfa6dff 100644 --- a/pages/friends/of.php +++ b/pages/friends/of.php @@ -2,8 +2,8 @@ /** * Elgg friends of page * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Social.Friends */ $owner = elgg_get_page_owner_entity(); |