Revert "Move Objects to Model"

[friendica.git] / include / uimport.php

diff --git a/include/uimport.php b/include/uimport.php
index e3c2f4e6c1f69c0b67953cf895ffd55e30b0d558..7effcd62ddd9da5f05f74b81cf95f681e8945a5b 100644 (file)
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -7,8 +7,7 @@ use Friendica\Core\System;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
-use Friendica\Model\Photo;
-use Friendica\Object\Image;
+use Friendica\Object\Photo;
 
 define("IMPORT_DEBUG", False);
 
@@ -261,9 +260,8 @@ function import_account(App $a, $file) {
                $photo['uid'] = $newuid;
                $photo['data'] = hex2bin($photo['data']);
 
-               $Image = new Image($photo['data'], $photo['type']);
-               $r = Photo::store(
-                               $Image,
+               $p = new Photo($photo['data'], $photo['type']);
+               $r = $p->store(
                                $photo['uid'], $photo['contact-id'], //0
                                $photo['resource-id'], $photo['filename'], $photo['album'], $photo['scale'], $photo['profile'], //1
                                $photo['allow_cid'], $photo['allow_gid'], $photo['deny_cid'], $photo['deny_gid']