aboutsummaryrefslogtreecommitdiffstats
path: root/include/photo/photo_driver.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-07-29 22:04:07 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-07-29 22:04:07 +0200
commit98fa996b3f5125b60e2653bca2218b08041ad6a4 (patch)
tree685c3909ac49f7a25cd39877f74ed56ada9b15e0 /include/photo/photo_driver.php
parent07e890a79a5c506b2e32272edf86ad4aba3b8fba (diff)
parentcbb6d37b6ca7e5d9e476fd3e7bea3ba56d3271e1 (diff)
downloadvolse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.tar.gz
volse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.tar.bz2
volse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/photo/photo_driver.php')
-rw-r--r--include/photo/photo_driver.php8
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);