Fix problems when crop controls not touched

This commit is contained in:
Meitar Moscovitz 2009-01-29 14:56:22 -05:00 committed by Evan Prodromou
parent 440d7d17b0
commit 5543cd21c6

View File

@ -380,11 +380,6 @@ class GrouplogoAction extends Action
$profile = $user->getProfile(); $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']; $filedata = $_SESSION['FILEDATA'];
if (!$filedata) { if (!$filedata) {
@ -392,6 +387,11 @@ class GrouplogoAction extends Action
return; 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']); $filepath = common_avatar_path($filedata['filename']);
if (!file_exists($filepath)) { if (!file_exists($filepath)) {