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 /include | |
| 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 'include')
| -rw-r--r-- | include/photos.php | 20 | ||||
| -rw-r--r-- | include/text.php | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/include/photos.php b/include/photos.php index d0c5f77fc..d5553b495 100644 --- a/include/photos.php +++ b/include/photos.php @@ -1011,23 +1011,3 @@ function profile_photo_set_profile_perms($uid, $profileid = 0) { } } } - -function fetch_image_from_url($url,&$mimetype) { - - $redirects = 0; - $x = z_fetch_url($url,true,$redirects,[ 'novalidate' => true ]); - if($x['success']) { - $hdrs = []; - $h = explode("\n",$x['header']); - foreach ($h as $l) { - list($k,$v) = array_map("trim", explode(":", trim($l), 2)); - $hdrs[strtolower($k)] = $v; - } - if (array_key_exists('content-type', $hdrs)) - $mimetype = $hdrs['content-type']; - - return $x['body']; - } - - return EMPTY_STR; -}
\ No newline at end of file diff --git a/include/text.php b/include/text.php index 6a6d814d7..646bfe749 100644 --- a/include/text.php +++ b/include/text.php @@ -1061,7 +1061,7 @@ function micropro($contact, $redirect = false, $class = '', $mode = false) { function search($s,$id='search-box',$url='/search',$save = false) { return replace_macros(get_markup_template('searchbox.tpl'),array( - '$s' => htmlspecialchars($s), + '$s' => $s, '$id' => $id, '$action_url' => z_root() . $url, '$search_label' => t('Search'), |