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

sort out the rest of the nasty stuff in the attachment/file api - time to move on to something else

Browse Source
This commit is contained in:
friendica
2013-02-01 00:49:07 -08:00
parent 5ca88ca10a
commit 344b8593a8
4 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/items.php
View File

@@ -496,7 +496,7 @@ function get_item_elements($x) {
$arr['object'] = activity_sanitise($x['object']);
$arr['target'] = activity_sanitise($x['target']);
$arr['attach'] = implode(',',activity_sanitise($x['attach']));
$arr['attach'] = activity_sanitise($x['attach']);
$arr['term'] = decode_tags($x['tags']);
$arr['item_private'] = ((array_key_exists('flags',$x) && is_array($x['flags']) && in_array('private',$x['flags'])) ? 1 : 0);
@@ -588,7 +588,7 @@ function encode_item($item) {
if($item['target'])
$x['target'] = json_decode($item['target'],true);
if($item['attach'])
$x['attach'] = explode(',', $item['attach']);
$x['attach'] = json_decode($item['attach'],true);
if($y = encode_item_flags($item))
$x['flags'] = $y;
if($item['term'])
@@ -1260,6 +1260,11 @@ function item_store($arr,$force_parent = false) {
$arr['target'] = json_encode($arr['target']);
}
if((x($arr,'attach')) && is_array($arr['attach'])) {
activity_sanitise($arr['attach']);
$arr['attach'] = json_encode($arr['attach']);
}
$arr['aid'] = ((x($arr,'aid')) ? intval($arr['aid']) : 0);
$arr['uri'] = ((x($arr,'uri')) ? notags(trim($arr['uri'])) : random_string());
$arr['author_xchan'] = ((x($arr,'author_xchan')) ? notags(trim($arr['author_xchan'])) : '');