aboutsummaryrefslogtreecommitdiffstats
path: root/include/Photo.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-02-25 20:06:33 -0800
committerfriendica <info@friendica.com>2013-02-25 20:06:33 -0800
commitc45a8e27638592fc89826097efe07ded31f3c50a (patch)
tree6ff76724684ff36d327afb7a7b4fcd06ce11de4d /include/Photo.php
parent46a89910aea43d0af6ace66de315fff87ee2d53a (diff)
downloadvolse-hubzilla-c45a8e27638592fc89826097efe07ded31f3c50a.tar.gz
volse-hubzilla-c45a8e27638592fc89826097efe07ded31f3c50a.tar.bz2
volse-hubzilla-c45a8e27638592fc89826097efe07ded31f3c50a.zip
make sure old fetch_url calls (and those that provided their own curl wrapper) go through z_fetch_url
Diffstat (limited to 'include/Photo.php')
-rw-r--r--include/Photo.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/Photo.php b/include/Photo.php
index d470de0ad..8daac450e 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -672,9 +672,12 @@ function import_profile_photo($photo,$xchan) {
$filename = basename($photo);
- $img_str = fetch_url($photo,true);
-
$type = guess_image_type($photo,true);
+ $result = z_fetch_url($photo,true);
+
+ if($result['success'])
+ $img_str = $result['body'];
+
$img = new Photo($img_str, $type);
if($img->is_valid()) {