harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace fetch_image_from_url() with z_fetch_url()

Browse Source
This commit is contained in:
Max Kostikov 2018-11-13 11:38:49 +01:00
parent 2f59d78737
commit 286326a98e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Zotlabs/Module/Photo.php
View File

@ -89,9 +89,8 @@ 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['success'] ? $x['body'] : EMPTY_STR);
if(! $mimetype) {
$mimetype = 'image/png'; $mimetype = 'image/png';
} }
} }
@ -200,19 +199,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['success'] ? $x['body'] : EMPTY_STR);
$mimetype = 'image/png';
} }
} }