Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 02:30:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Move Objects to Model"

Browse source
This commit is contained in:
Michael Vogel 2017-12-08 05:21:51 +01:00 • committed by GitHub
parent e437c74d0e
commit 5747cfc79c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
77 changed files with 593 additions and 636 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Protocol/DFRN.php
View file

@ -13,10 +13,10 @@ use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Model\Profile;
use Friendica\Object\Image;
use Friendica\Model\GlobalContact;
use Friendica\Object\Contact;
use Friendica\Object\Photo;
use Friendica\Object\Profile;
use Friendica\Protocol\OStatus;
use Friendica\Util\XML;
@ -476,7 +476,7 @@ class DFRN
$uid
);
$photos = array();
$ext = Image::supportedTypes();
$ext = Photo::supportedTypes();
foreach ($rp as $p) {
$photos[$p['scale']] = System::baseUrl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
@ -1678,9 +1678,9 @@ class DFRN
$poco["photo"] = $author["avatar"];
$poco["hide"] = $hide;
$poco["contact-type"] = $contact["contact-type"];
$gcid = GContact::update($poco);
$gcid = GlobalContact::update($poco);
GContact::link($gcid, $importer["uid"], $contact["id"]);
GlobalContact::link($gcid, $importer["uid"], $contact["id"]);
}
return($author);