harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source
This commit is contained in:
redmatrix
2015-07-20 19:35:00 -07:00
parent d87c7ceeb0 4d45bc9da1
commit 5146e6e76b
18 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/identity.php
View File

@@ -1393,10 +1393,10 @@ function get_theme_uid() {
* with the specified size.
*
* @param int $size
* one of (175, 80, 48)
* one of (300, 80, 48)
* @returns string
*/
function get_default_profile_photo($size = 175) {
function get_default_profile_photo($size = 300) {
$scheme = get_config('system','default_profile_photo');
if(! $scheme)
$scheme = 'rainbow_man';

4
include/network.php
View File

@@ -531,7 +531,7 @@ function avatar_img($email) {
$avatar = array();
$a = get_app();
$avatar['size'] = 175;
$avatar['size'] = 300;
$avatar['email'] = $email;
$avatar['url'] = '';
$avatar['success'] = false;
@@ -1658,4 +1658,4 @@ function format_and_send_email($sender,$xchan,$item) {
}
}

8
include/photo/photo_driver.php
View File

@@ -606,16 +606,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);
}
}
@@ -682,7 +682,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_flags' => PHOTO_PROFILE, 'scale' => 4);