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

Merge pull request #4205 from MrPetovan/bug/4200-fix-contact-selectfirst 

Fix selectFirst usage in Model\Contact
This commit is contained in:
Michael Vogel 2018-01-11 06:00:04 +01:00 committed by GitHub
parent 47e0900220 3f078d81ce
commit 10b4171b36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Model/Contact.php
View File

@ -1246,15 +1246,13 @@ class Contact extends BaseObject
);
}
$r = dba::selectFirst('contact', ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
if (!DBM::is_result($r)) {
$contact = dba::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
if (!DBM::is_result($contact)) {
$result['message'] .= t('Unable to retrieve contact information.') . EOL;
return $result;
}
$contact = $r;
$contact_id = $r['id'];
$contact_id = $contact['id'];
$result['cid'] = $contact_id;
Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact_id);