diff options
author | habeascodice <habeascodice@federated.social> | 2014-10-06 08:43:29 -0700 |
---|---|---|
committer | habeascodice <habeascodice@federated.social> | 2014-10-06 08:43:29 -0700 |
commit | 6b40c2cd090d1c406b3e1cd7ad135baff21bfd54 (patch) | |
tree | a9d5b42f896384b129b8edfe5b9e8ec2b21ca21d /include/photo | |
parent | 79bb60aafd39fef7bc4d03eb40d33e23af5b793f (diff) | |
parent | 34ef3fda76a924d09e77a698e38b79922b8b7f88 (diff) | |
download | volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.tar.gz volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.tar.bz2 volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/photo')
-rw-r--r-- | include/photo/photo_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index daf1bfc25..d9777b1c4 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -623,7 +623,7 @@ function import_profile_photo($photo,$xchan,$thing = false) { $photo = $a->get_baseurl() . '/' . get_default_profile_photo(); $thumb = $a->get_baseurl() . '/' . get_default_profile_photo(80); $micro = $a->get_baseurl() . '/' . get_default_profile_photo(48); - $type = 'image/jpeg'; + $type = 'image/png'; } return(array($photo,$thumb,$micro,$type,$photo_failure)); |