From: Meitar Moscovitz <meitarm@gmail.com>
Date: Tue, 3 Feb 2009 16:34:17 +0000 (+1100)
Subject: Fix PHP warnings when user avatar crop controls aren'tn touched.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=01b6aca078f9665eb01c1b1fbbbe2f4c6340cf9b;p=quix0rs-gnu-social.git

Fix PHP warnings when user avatar crop controls aren'tn touched.
---

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 19f53b8828..3029b06211 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)) {