aboutsummaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2013-06-25 06:48:14 -0400
committerCash Costello <cash.costello@gmail.com>2013-06-25 06:48:14 -0400
commita5497129871c4f11b4f26ea1ed19e27670ded296 (patch)
tree993a3dae71a871459fec6bea1dd6469d18db9e09 /pages
parentc9d1dd21d3dcf7353570d555c21a2b6ca7ecdd00 (diff)
parentdd9df95001f5293e7a3a93a365c64842fe3650e4 (diff)
downloadelgg-a5497129871c4f11b4f26ea1ed19e27670ded296.tar.gz
elgg-a5497129871c4f11b4f26ea1ed19e27670ded296.tar.bz2
Merge branch '18_avatar' into 1.8
Diffstat (limited to 'pages')
-rw-r--r--pages/avatar/edit.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/pages/avatar/edit.php b/pages/avatar/edit.php
index c71633b8b..56aede887 100644
--- a/pages/avatar/edit.php
+++ b/pages/avatar/edit.php
@@ -11,6 +11,11 @@ elgg_set_context('profile_edit');
$title = elgg_echo('avatar:edit');
$entity = elgg_get_page_owner_entity();
+if (!elgg_instanceof($entity, 'user') || !$entity->canEdit()) {
+ register_error(elgg_echo('avatar:noaccess'));
+ forward(REFERER);
+}
+
$content = elgg_view('core/avatar/upload', array('entity' => $entity));
// only offer the crop view if an avatar has been uploaded