From d753492382cf2351886ca94580ea7fbb021f06f0 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 1 Jul 2018 22:48:05 -0700 Subject: bad merge --- include/items.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/items.php') diff --git a/include/items.php b/include/items.php index 83ee219a2..9dd5d005b 100755 --- a/include/items.php +++ b/include/items.php @@ -981,6 +981,8 @@ function empty_acl($item) { function encode_item($item,$mirror = false) { $x = []; + $x['type'] = 'activity'; + $x['encoding'] = 'zot'; $r = q("select channel_id from channel where channel_id = %d limit 1", intval($item['uid']) @@ -1359,6 +1361,8 @@ function encode_item_flags($item) { function encode_mail($item,$extended = false) { $x = []; + $x['type'] = 'mail'; + $x['encoding'] = 'zot'; if(array_key_exists('mail_obscured',$item) && intval($item['mail_obscured'])) { if($item['title']) -- cgit v1.2.3