Fixes #4350 (Edit Avatar - Crop button is misleading, should be hidden if

avatar hasn't been created yet)

diff --git a/actions/avatar/crop.php b/actions/avatar/crop.php
index f2b812c4f3db0d9b729d5c571338d4f080884093..b9a80f331d61c33df33f14862f4921cd5c08e430 100644 (file)
--- a/actions/avatar/crop.php
+++ b/actions/avatar/crop.php
@@ -22,6 +22,12 @@ $filehandler->owner_guid = $owner->getGUID();
 $filehandler->setFilename("profile/" . $owner->guid . "master" . ".jpg");
 $filename = $filehandler->getFilenameOnFilestore();
 
+// ensuring the avatar image exists in the first place
+if (!file_exists($filename)) {
+       register_error(elgg_echo('avatar:crop:fail'));
+       forward(REFERER);
+}
+
 $icon_sizes = elgg_get_config('icon_sizes');
 unset($icon_sizes['master']);
 

diff --git a/pages/avatar/edit.php b/pages/avatar/edit.php
index eef8f8f8be9e58676c66a369b6c66bd7cd9ae16b..c71633b8bec44cce383d33cd74e85a2b31c18603 100644 (file)
--- a/pages/avatar/edit.php
+++ b/pages/avatar/edit.php
@@ -10,8 +10,13 @@ elgg_set_context('profile_edit');
 
 $title = elgg_echo('avatar:edit');
 
-$content = elgg_view('core/avatar/upload', array('entity' => elgg_get_page_owner_entity()));
-$content .= elgg_view('core/avatar/crop', array('entity' => elgg_get_page_owner_entity()));
+$entity = elgg_get_page_owner_entity();
+$content = elgg_view('core/avatar/upload', array('entity' => $entity));
+
+// only offer the crop view if an avatar has been uploaded
+if (isset($entity->icontime)) {
+       $content .= elgg_view('core/avatar/crop', array('entity' => $entity));
+}
 
 $params = array(
        'content' => $content,