clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases 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
77 changed files with 593 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/uimport.php
View File

@@ -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']