aboutsummaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-11-15 20:30:59 -0500
committercash <cash.costello@gmail.com>2011-11-16 19:53:04 -0500
commit87a7d965c87e882857fc759d765a9d6b2f01fafa (patch)
tree32053a81ceedf67f4655b266b98618752973347b /actions
parent92c1bcd1355c2e4b661d0bb90f5492258815d329 (diff)
downloadelgg-87a7d965c87e882857fc759d765a9d6b2f01fafa.tar.gz
elgg-87a7d965c87e882857fc759d765a9d6b2f01fafa.tar.bz2
fixed bugs in avatar cropping with remembering old crop coordinates and resizing the master
Diffstat (limited to 'actions')
-rw-r--r--actions/avatar/crop.php1
-rw-r--r--actions/avatar/upload.php6
2 files changed, 7 insertions, 0 deletions
diff --git a/actions/avatar/crop.php b/actions/avatar/crop.php
index 39061fa2c..6d71b6f06 100644
--- a/actions/avatar/crop.php
+++ b/actions/avatar/crop.php
@@ -23,6 +23,7 @@ $filehandler->setFilename("profile/" . $owner->guid . "master" . ".jpg");
$filename = $filehandler->getFilenameOnFilestore();
$icon_sizes = elgg_get_config('icon_sizes');
+unset($icon_sizes['master']);
// get the images and save their file handlers into an array
// so we can do clean up if one fails.
diff --git a/actions/avatar/upload.php b/actions/avatar/upload.php
index 2e8ff98b3..0752615e0 100644
--- a/actions/avatar/upload.php
+++ b/actions/avatar/upload.php
@@ -44,6 +44,12 @@ foreach ($icon_sizes as $name => $size_info) {
}
}
+// reset crop coordinates
+$owner->x1 = 0;
+$owner->x2 = 0;
+$owner->y1 = 0;
+$owner->y2 = 0;
+
$owner->icontime = time();
if (elgg_trigger_event('profileiconupdate', $owner->type, $owner)) {
system_message(elgg_echo("avatar:upload:success"));