aboutsummaryrefslogtreecommitdiff
path: root/actions/avatar
diff options
context:
space:
mode:
authorJanek Lasocki-Biczysko <j.lasocki-biczysko@intrallect.com>2012-02-03 09:27:31 +0000
committerCash Costello <cash.costello@gmail.com>2012-02-08 07:23:07 -0500
commit4cb2be135171e8e42b70f0165cfbb6cc6905cd8e (patch)
tree4e5f260e346edd81200eea80d6082079d864aef9 /actions/avatar
parentfe22ee87a5199b5ac9f736b5374f56ec909106ea (diff)
downloadelgg-4cb2be135171e8e42b70f0165cfbb6cc6905cd8e.tar.gz
elgg-4cb2be135171e8e42b70f0165cfbb6cc6905cd8e.tar.bz2
Fixes #4350 (Edit Avatar - Crop button is misleading, should be hidden if
avatar hasn't been created yet)
Diffstat (limited to 'actions/avatar')
-rw-r--r--actions/avatar/crop.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/actions/avatar/crop.php b/actions/avatar/crop.php
index f2b812c4f..b9a80f331 100644
--- 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']);