diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/avatarsettings.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 19f53b882..3029b0621 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -316,11 +316,6 @@ class AvatarsettingsAction extends AccountSettingsAction $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) { @@ -328,6 +323,11 @@ class AvatarsettingsAction extends AccountSettingsAction 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)) { |