clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates 

Updates from review changes to main friendica project
This commit is contained in:
Adam Magness 2017-11-29 17:38:05 -05:00
parent 30fa9ac76c
commit 7b6bc4777c
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fromgplus/fromgplus.php
View File

@ -264,12 +264,12 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
} }
if ($cleaned["full"] != "") if ($cleaned["full"] != "")
$infoFull = Photo::getPhotoInfo($cleaned["full"]); $infoFull = Photo::getInfoFromURL($cleaned["full"]);
else else
$infoFull = array("0" => 0, "1" => 0); $infoFull = array("0" => 0, "1" => 0);
if ($cleaned["preview"] != "") if ($cleaned["preview"] != "")
$infoPreview = Photo::getPhotoInfo($cleaned["preview"]); $infoPreview = Photo::getInfoFromURL($cleaned["preview"]);
else else
$infoFull = array("0" => 0, "1" => 0); $infoFull = array("0" => 0, "1" => 0);

3
pumpio/pumpio.php
View File

@ -10,7 +10,6 @@ use Friendica\Core\PConfig;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Model\GlobalContact; use Friendica\Model\GlobalContact;
use Friendica\Object\Contact; use Friendica\Object\Contact;
use Friendica\Object\Photo;
require 'addon/pumpio/oauth/http.php'; require 'addon/pumpio/oauth/http.php';
require 'addon/pumpio/oauth/oauth_client.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); return($contact_id);
} }

2
twitter/twitter.php
View File

@ -951,7 +951,7 @@ function twitter_fix_avatar($avatar) {
$new_avatar = str_replace("_normal.", ".", $avatar); $new_avatar = str_replace("_normal.", ".", $avatar);
$info = Photo::getPhotoInfo($new_avatar); $info = Photo::getInfoFromURL($new_avatar);
if (!$info) if (!$info)
$new_avatar = $avatar; $new_avatar = $avatar;