Revert "Move Objects to Model"

[friendica.git] / src / Protocol / DFRN.php

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 62ada9620ae902f7214dceaac15a840b593449fa..5af082905d847ecd7e0a3a0fd4614e9c1c002aae 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -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);