diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index e0a49b3f..665590d3 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -264,12 +264,12 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) { } if ($cleaned["full"] != "") - $infoFull = Photo::getPhotoInfo($cleaned["full"]); + $infoFull = Photo::getInfoFromURL($cleaned["full"]); else $infoFull = array("0" => 0, "1" => 0); if ($cleaned["preview"] != "") - $infoPreview = Photo::getPhotoInfo($cleaned["preview"]); + $infoPreview = Photo::getInfoFromURL($cleaned["preview"]); else $infoFull = array("0" => 0, "1" => 0); diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 37a09c7a..9cf2461f 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -10,7 +10,6 @@ use Friendica\Core\PConfig; use Friendica\Core\Worker; use Friendica\Model\GlobalContact; use Friendica\Object\Contact; -use Friendica\Object\Photo; require 'addon/pumpio/oauth/http.php'; require 'addon/pumpio/oauth/oauth_client.php'; @@ -1046,7 +1045,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { */ } - Photo::updateContactAvatar($contact->image->url, $uid, $contact_id); + Contact::updateAvatar($contact->image->url, $uid, $contact_id); return($contact_id); } diff --git a/twitter/twitter.php b/twitter/twitter.php index 8b42e187..de0ba71a 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -951,7 +951,7 @@ function twitter_fix_avatar($avatar) { $new_avatar = str_replace("_normal.", ".", $avatar); - $info = Photo::getPhotoInfo($new_avatar); + $info = Photo::getInfoFromURL($new_avatar); if (!$info) $new_avatar = $avatar;