diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-21 17:13:48 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-21 17:13:48 -0700 |
| commit | c90f14c066d0f289bd2220bb66325db12700aa57 (patch) | |
| tree | 6c915ad03936d479d1d807540bbc0e7ae0f854ad /include/photo | |
| parent | 24ec104819bbc3778a159ea4790398988a6e2fd7 (diff) | |
| parent | 3ec6a431b62c20952f07f889acfeedd0ac456d04 (diff) | |
| download | volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.tar.gz volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.tar.bz2 volse-hubzilla-c90f14c066d0f289bd2220bb66325db12700aa57.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
doc/to_do_code.bb
Diffstat (limited to 'include/photo')
| -rw-r--r-- | include/photo/photo_driver.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 1501e6712..426eb6aac 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -605,16 +605,16 @@ function import_profile_photo($photo,$xchan,$thing = false) { if(($width / $height) > 1.2) { // crop out the sides $margin = $width - $height; - $img->cropImage(175,($margin / 2),0,$height,$height); + $img->cropImage(300,($margin / 2),0,$height,$height); } elseif(($height / $width) > 1.2) { // crop out the bottom $margin = $height - $width; - $img->cropImage(175,0,0,$width,$width); + $img->cropImage(300,0,0,$width,$width); } else { - $img->scaleImageSquare(175); + $img->scaleImageSquare(300); } } @@ -681,7 +681,7 @@ function import_channel_photo($photo,$type,$aid,$uid) { $img = photo_factory($photo, $type); if($img->is_valid()) { - $img->scaleImageSquare(175); + $img->scaleImageSquare(300); $p = array('aid' => $aid, 'uid' => $uid, 'resource_id' => $hash, 'filename' => $filename, 'album' => t('Profile Photos'), 'photo_usage' => PHOTO_PROFILE, 'scale' => 4); |