summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/grouplogo.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index 11489691e..ba9cdfe2a 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -380,11 +380,6 @@ class GrouplogoAction extends Action
$profile = $user->getProfile();
- $x = $this->arg('avatar_crop_x');
- $y = $this->arg('avatar_crop_y');
- $w = $this->arg('avatar_crop_w');
- $h = $this->arg('avatar_crop_h');
-
$filedata = $_SESSION['FILEDATA'];
if (!$filedata) {
@@ -392,6 +387,11 @@ class GrouplogoAction extends Action
return;
}
+ $x = $this->arg('avatar_crop_x');
+ $y = $this->arg('avatar_crop_y');
+ $w = ($this->arg('avatar_crop_w')) ? $this->arg('avatar_crop_w') : $filedata['width'];
+ $h = ($this->arg('avatar_crop_h')) ? $this->arg('avatar_crop_h') : $filedata['height'];
+
$filepath = common_avatar_path($filedata['filename']);
if (!file_exists($filepath)) {