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

Merge branch 'revert-6375f2d7' into 'dev'

Browse Source 
Revert "Replace fetch_image_from_url() with z_fetch_url()"

See merge request hubzilla/core!1392
This commit is contained in:
Max Kostikov 2018-11-13 11:36:02 +01:00
commit adf4782076
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Zotlabs/Module/Photo.php
View File

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