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

bad merge

Browse Source
This commit is contained in:
zotlabs
2018-07-01 22:48:05 -07:00
parent 8c26db63dd
commit d753492382
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.php
View File

@@ -981,6 +981,8 @@ function empty_acl($item) {
function encode_item($item,$mirror = false) { function encode_item($item,$mirror = false) {
$x = []; $x = [];
$x['type'] = 'activity';
$x['encoding'] = 'zot';
$r = q("select channel_id from channel where channel_id = %d limit 1", $r = q("select channel_id from channel where channel_id = %d limit 1",
intval($item['uid']) intval($item['uid'])
@@ -1359,6 +1361,8 @@ function encode_item_flags($item) {
function encode_mail($item,$extended = false) { function encode_mail($item,$extended = false) {
$x = []; $x = [];
$x['type'] = 'mail';
$x['encoding'] = 'zot';
if(array_key_exists('mail_obscured',$item) && intval($item['mail_obscured'])) { if(array_key_exists('mail_obscured',$item) && intval($item['mail_obscured'])) {
if($item['title']) if($item['title'])