Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 21:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Separate Object\Photo into Model\Photo and Object\Image

Browse source 
- Renamed a bunch of functions to shorter or clearer names
This commit is contained in:
Hypolite Petovan 2017-12-07 08:56:11 -05:00
parent 70597eb67a
commit 52bddd580c
22 changed files with 464 additions and 408 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/uimport.php
View file

@ -7,7 +7,8 @@ use Friendica\Core\System;
use Friendica\Core\PConfig;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Object\Photo;
use Friendica\Model\Photo;
use Friendica\Object\Image;
define("IMPORT_DEBUG", False);
@ -260,8 +261,9 @@ function import_account(App $a, $file) {
$photo['uid'] = $newuid;
$photo['data'] = hex2bin($photo['data']);
$p = new Photo($photo['data'], $photo['type']);
$r = $p->store(
$Image = new Image($photo['data'], $photo['type']);
$r = Photo::store(
$Image,
$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']