friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #328 from annando/1511-statusnet-contact 

Bugfix: The Statusnet connector destroyed the avatar and the name
pull/332/head
Tobias Diekershoff 2015-11-29 08:24:26 +01:00
parent 699fa4c44f 37094047a1
commit e548c572d9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
statusnet/statusnet.php
View File

@ -932,8 +932,8 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
dbesc($contact->description), dbesc($contact->description),
dbesc(normalise_link($contact->statusnet_profile_url))); dbesc(normalise_link($contact->statusnet_profile_url)));
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1",
intval($uid), dbesc(normalise_link($contact->statusnet_profile_url))); intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(NETWORK_STATUSNET));
if(!count($r) AND !$create_user) if(!count($r) AND !$create_user)
return(0); return(0);
@ -966,10 +966,10 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
intval(1) intval(1)
); );
$r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1",
dbesc($contact->statusnet_profile_url), dbesc($contact->statusnet_profile_url),
intval($uid) intval($uid),
); dbesc(NETWORK_STATUSNET));
if(! count($r)) if(! count($r))
return(false); return(false);