aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-07-01 22:48:05 -0700
committerzotlabs <mike@macgirvin.com>2018-07-01 22:48:05 -0700
commitd753492382cf2351886ca94580ea7fbb021f06f0 (patch)
tree09010b7a38e7e74d27522a6d33d45c4570407875
parent8c26db63ddf449a033e488b5d95af83fe08bdb2e (diff)
downloadvolse-hubzilla-d753492382cf2351886ca94580ea7fbb021f06f0.tar.gz
volse-hubzilla-d753492382cf2351886ca94580ea7fbb021f06f0.tar.bz2
volse-hubzilla-d753492382cf2351886ca94580ea7fbb021f06f0.zip
bad merge
-rwxr-xr-xinclude/items.php4
1 files changed, 4 insertions, 0 deletions
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'])