harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/red

Browse Source
This commit is contained in:
Habeas Codice 2015-01-24 21:18:27 -08:00
commit af7fa99e2e
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/attach.php
View File

@ -981,17 +981,25 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
$jsonobject = json_encode($object); $jsonobject = json_encode($object);
//check if item for this object exists //check if item for this object exists
$y = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND object = '%s' LIMIT 1", $y = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND resource_id = '%s' AND uid = %d LIMIT 1",
dbesc(ACTIVITY_POST), dbesc(ACTIVITY_POST),
dbesc($objtype), dbesc($objtype),
dbesc($jsonobject) dbesc($object['hash']),
intval(local_user())
); );
if($y) { if($y) {
$update = true; $update = true;
$object['d_mid'] = $y[0]['mid']; //attach mid of the old object $object['d_mid'] = $y[0]['mid']; //attach mid of the old object
$u_jsonobject = json_encode($object); $u_jsonobject = json_encode($object);
//we have got the relevant info - delete the old item before we create the new one
$z = q("DELETE FROM item WHERE obj_type = '%s' AND verb = '%s' AND mid = '%s'",
dbesc(ACTIVITY_OBJ_FILE),
dbesc(ACTIVITY_POST),
dbesc($y[0]['mid'])
);
} }
if($update && $verb == 'post' ) { if($update && $verb == 'post' ) {
@ -1019,6 +1027,8 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
$arr['verb'] = ACTIVITY_UPDATE; $arr['verb'] = ACTIVITY_UPDATE;
$arr['obj_type'] = $objtype; $arr['obj_type'] = $objtype;
$arr['object'] = $u_jsonobject; $arr['object'] = $u_jsonobject;
$arr['resource_id'] = $object['hash'];
$arr['resource_type'] = 'attach';
$arr['body'] = ''; $arr['body'] = '';
$post = item_store($arr); $post = item_store($arr);
@ -1057,6 +1067,8 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
$arr['item_private'] = $private; $arr['item_private'] = $private;
$arr['verb'] = (($update) ? ACTIVITY_UPDATE : ACTIVITY_POST); $arr['verb'] = (($update) ? ACTIVITY_UPDATE : ACTIVITY_POST);
$arr['obj_type'] = $objtype; $arr['obj_type'] = $objtype;
$arr['resource_id'] = $object['hash'];
$arr['resource_type'] = 'attach';
$arr['object'] = (($update) ? $u_jsonobject : $jsonobject); $arr['object'] = (($update) ? $u_jsonobject : $jsonobject);
$arr['body'] = ''; $arr['body'] = '';