diff options
| author | zotlabs <mike@macgirvin.com> | 2018-11-14 16:42:03 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-11-14 16:42:03 -0800 |
| commit | b64dd7ab57db272fb8ad100d9cba7d1badaa95ff (patch) | |
| tree | dc79bf03977cd1e4a8d69661fe0955bbdde85a36 /Zotlabs | |
| parent | bf013ecf00c710d6056890a6994eedd096121841 (diff) | |
| parent | 62b367fa8177ed16958864a4799a0a2a9aa0119b (diff) | |
| download | volse-hubzilla-b64dd7ab57db272fb8ad100d9cba7d1badaa95ff.tar.gz volse-hubzilla-b64dd7ab57db272fb8ad100d9cba7d1badaa95ff.tar.bz2 volse-hubzilla-b64dd7ab57db272fb8ad100d9cba7d1badaa95ff.zip | |
Merge branch 'master' into zvi
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Photo.php | 17 | ||||
| -rw-r--r-- | Zotlabs/Module/Search.php | 4 |
2 files changed, 11 insertions, 10 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 95e3404fb..30e8340e2 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -4,7 +4,6 @@ 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 { @@ -89,10 +88,9 @@ class Photo extends \Zotlabs\Web\Controller { } if(! $data) { - $data = fetch_image_from_url($default,$mimetype); - } - if(! $mimetype) { - $mimetype = 'image/png'; + $x = z_fetch_url($default,true,0,[ 'novalidate' => true ]); + $data = ($x['success'] ? $x['body'] : EMPTY_STR); + $mimetype = 'image/png'; } } else { @@ -200,19 +198,22 @@ class Photo extends \Zotlabs\Web\Controller { if(isset($resolution)) { switch($resolution) { case 4: - $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(),$mimetype); + $default = get_default_profile_photo(); break; case 5: - $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(80),$mimetype); + $default = get_default_profile_photo(80); break; case 6: - $data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(48),$mimetype); + $default = get_default_profile_photo(48); break; default: killme(); // NOTREACHED break; } + $x = z_fetch_url(z_root() . '/' . $default,true,0,[ 'novalidate' => true ]); + $data = ($x['success'] ? $x['body'] : EMPTY_STR); + $mimetype = 'image/png'; } } diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 272bbdac1..838f9d6b9 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -227,9 +227,9 @@ class Search extends \Zotlabs\Web\Controller { } if($tag) - $o .= '<h2>' . sprintf( t('Items tagged with: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8')) . '</h2>'; + $o .= '<h2>' . sprintf( t('Items tagged with: %s'),$search) . '</h2>'; else - $o .= '<h2>' . sprintf( t('Search results for: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8')) . '</h2>'; + $o .= '<h2>' . sprintf( t('Search results for: %s'),$search) . '</h2>'; $o .= conversation($items,'search',$update,'client'); |