From 7b6bc4777c95a9aed81c6d9e94aeea05d584236a Mon Sep 17 00:00:00 2001
From: Adam Magness <adam.magness@gmail.com>
Date: Wed, 29 Nov 2017 17:38:05 -0500
Subject: [PATCH] Updates

Updates from review changes to main friendica project
---
 fromgplus/fromgplus.php | 4 ++--
 pumpio/pumpio.php       | 3 +--
 twitter/twitter.php     | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index e0a49b3fd..665590d34 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 37a09c7a6..9cf2461fe 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 8b42e1872..de0ba71ac 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;