forked from GNUsocial/gnu-social
Fix PHP warnings when user avatar crop controls aren'tn touched.
This commit is contained in:
parent
22c806a15a
commit
01b6aca078
@ -316,11 +316,6 @@ class AvatarsettingsAction extends AccountSettingsAction
|
|||||||
|
|
||||||
$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) {
|
||||||
@ -328,6 +323,11 @@ class AvatarsettingsAction extends AccountSettingsAction
|
|||||||
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)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user