diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-05-18 13:07:24 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-05-18 13:07:24 -0400 |
| commit | 40d99c171678654817e392b7f59050dccce770a8 (patch) | |
| tree | 4fc7352d72b0c40ef27998243d9c3b0a209db78b /Zotlabs/Module/Photo.php | |
| parent | 179eeb10a6e1b661dc7788d74d60a7c11dfca6bf (diff) | |
| parent | 5a6141faa2a87a4aeb00a566c1230f35544ff3d2 (diff) | |
| download | volse-hubzilla-40d99c171678654817e392b7f59050dccce770a8.tar.gz volse-hubzilla-40d99c171678654817e392b7f59050dccce770a8.tar.bz2 volse-hubzilla-40d99c171678654817e392b7f59050dccce770a8.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'Zotlabs/Module/Photo.php')
| -rw-r--r-- | Zotlabs/Module/Photo.php | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index ccc59ed09..f348866d9 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -4,6 +4,7 @@ namespace Zotlabs\Module; require_once('include/security.php'); require_once('include/attach.php'); require_once('include/photo/photo_driver.php'); +require_once('include/photos.php'); class Photo extends \Zotlabs\Web\Controller { @@ -83,7 +84,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 +184,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(); |