diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-28 11:09:22 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-28 11:09:22 +0200 |
| commit | 9f576369a97009bc93f4f724f85024410c3899df (patch) | |
| tree | adc2c68e8729ff783eca9cd259bc5b8fe394d2e6 /Zotlabs/Module/Profile_photo.php | |
| parent | 911510f9996dc43bd3440884325326b7e99ea12f (diff) | |
| parent | 7d7f43c2056fd50ff26aed5df553bf4936ead196 (diff) | |
| download | volse-hubzilla-9f576369a97009bc93f4f724f85024410c3899df.tar.gz volse-hubzilla-9f576369a97009bc93f4f724f85024410c3899df.tar.bz2 volse-hubzilla-9f576369a97009bc93f4f724f85024410c3899df.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Module/Profile_photo.php')
| -rw-r--r-- | Zotlabs/Module/Profile_photo.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index 62c5e99ae..9359b80f8 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -53,7 +53,7 @@ class Profile_photo extends \Zotlabs\Web\Controller { check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo'); - if((array_key_exists('postfinal',$_POST)) && (intval($_POST['cropfinal']) == 1)) { + if((array_key_exists('cropfinal',$_POST)) && (intval($_POST['cropfinal']) == 1)) { // phase 2 - we have finished cropping @@ -90,12 +90,11 @@ class Profile_photo extends \Zotlabs\Web\Controller { $srcY = $_POST['ystart']; $srcW = $_POST['xfinal'] - $srcX; $srcH = $_POST['yfinal'] - $srcY; - + $r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND imgscale = %d LIMIT 1", dbesc($image_id), dbesc(local_channel()), intval($scale)); - if($r) { $base_image = $r[0]; |