aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-20 19:35:00 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-20 19:35:00 -0700
commit5146e6e76bdc027cdb6036233cd1978a5bc036a3 (patch)
tree39b3392f1d4f56ae34a8fe2ccd47e1bb39fdf5e3 /include
parentd87c7ceeb03a348526cd2f8bb5643b13a1860b40 (diff)
parent4d45bc9da185c4c8f558b07f8020dce8171fb957 (diff)
downloadvolse-hubzilla-5146e6e76bdc027cdb6036233cd1978a5bc036a3.tar.gz
volse-hubzilla-5146e6e76bdc027cdb6036233cd1978a5bc036a3.tar.bz2
volse-hubzilla-5146e6e76bdc027cdb6036233cd1978a5bc036a3.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include')
-rw-r--r--include/identity.php4
-rw-r--r--include/network.php4
-rw-r--r--include/photo/photo_driver.php8
3 files changed, 8 insertions, 8 deletions
diff --git a/include/identity.php b/include/identity.php
index 3925c3537..5a3861b31 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -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';
diff --git a/include/network.php b/include/network.php
index 3abb1b40e..d9546a074 100644
--- a/include/network.php
+++ b/include/network.php
@@ -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) {
-} \ No newline at end of file
+}
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 6f508bf72..5d61556ab 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -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);