aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Photo.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-05-15 16:51:04 -0700
committerzotlabs <mike@macgirvin.com>2018-05-15 16:51:04 -0700
commitaac5fd96cc9ea03a329234f6b2bd8b12a0f4ae5f (patch)
treed84109a6b10d470235a279195f5218ae160ebedc /Zotlabs/Module/Photo.php
parent16930c1c54ef4bb3077bb868a366c0165eb33fae (diff)
downloadvolse-hubzilla-aac5fd96cc9ea03a329234f6b2bd8b12a0f4ae5f.tar.gz
volse-hubzilla-aac5fd96cc9ea03a329234f6b2bd8b12a0f4ae5f.tar.bz2
volse-hubzilla-aac5fd96cc9ea03a329234f6b2bd8b12a0f4ae5f.zip
provide function to fetch photo contents from url
Diffstat (limited to 'Zotlabs/Module/Photo.php')
-rw-r--r--Zotlabs/Module/Photo.php11
1 files changed, 4 insertions, 7 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index ccc59ed09..29ad06e80 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -83,7 +83,7 @@ class Photo extends \Zotlabs\Web\Controller {
$data = file_get_contents($data);
}
if(! $data) {
- $data = file_get_contents($default);
+ $data = fetch_image_from_url($default,$mimetype);
}
if(! $mimetype) {
$mimetype = 'image/png';
@@ -183,16 +183,13 @@ class Photo extends \Zotlabs\Web\Controller {
switch($resolution) {
case 4:
- $data = file_get_contents(z_root() . '/' . get_default_profile_photo());
- $mimetype = 'image/png';
+ $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(),$mimetype);
break;
case 5:
- $data = file_get_contents(z_root() . '/' . get_default_profile_photo(80));
- $mimetype = 'image/png';
+ $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(80),$mimetype);
break;
case 6:
- $data = file_get_contents(z_root() . '/' . get_default_profile_photo(48));
- $mimetype = 'image/png';
+ $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(48),$mimetype);
break;
default:
killme();