Replace fetch_image_from_url() with z_fetch_url()

This commit is contained in:
Max Kostikov 2018-11-13 11:25:14 +01:00
parent a7d3a49171
commit 6375f2d73a

View File

@ -89,11 +89,11 @@ class Photo extends \Zotlabs\Web\Controller {
} }
if(! $data) { if(! $data) {
$data = fetch_image_from_url($default,$mimetype); $x = z_fetch_url($default,true,0,[ 'novalidate' => true ]);
} $data = $x['body'];
if(! $mimetype) {
$mimetype = 'image/png'; $mimetype = 'image/png';
} }
} }
else { else {
@ -200,19 +200,22 @@ class Photo extends \Zotlabs\Web\Controller {
if(isset($resolution)) { if(isset($resolution)) {
switch($resolution) { switch($resolution) {
case 4: case 4:
$data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(),$mimetype); $default = z_root() . '/' . get_default_profile_photo();
break; break;
case 5: case 5:
$data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(80),$mimetype); $default = z_root() . '/' . get_default_profile_photo(80);
break; break;
case 6: case 6:
$data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(48),$mimetype); $default = z_root() . '/' . get_default_profile_photo(48);
break; break;
default: default:
killme(); killme();
// NOTREACHED // NOTREACHED
break; break;
} }
$x = z_fetch_url($default,true,0,[ 'novalidate' => true ]);
$data = $x['body'];
$mimetype = 'image/png';
} }
} }