diff options
| author | marijus <mario@mariovavti.com> | 2014-07-25 09:42:50 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-07-25 09:42:50 +0200 |
| commit | 9938f0c52b44b6173e02386d3415fbc69ac107ea (patch) | |
| tree | 5bdaaa2ba0fb8e48c3fd66bdd823a62928e30d67 /include/items.php | |
| parent | 9c40ee9e60df1eef0466f1c9f3cd9c30e429c80a (diff) | |
| parent | 18f5890cb14e7c40909fdb92bffefee3415ba411 (diff) | |
| download | volse-hubzilla-9938f0c52b44b6173e02386d3415fbc69ac107ea.tar.gz volse-hubzilla-9938f0c52b44b6173e02386d3415fbc69ac107ea.tar.bz2 volse-hubzilla-9938f0c52b44b6173e02386d3415fbc69ac107ea.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index 10daa85f2..679c24dc1 100755 --- a/include/items.php +++ b/include/items.php @@ -838,6 +838,7 @@ function import_author_rss($x) { function encode_item($item) { $x = array(); $x['type'] = 'activity'; + $x['encoding'] = 'zot'; // logger('encode_item: ' . print_r($item,true)); @@ -1069,6 +1070,7 @@ function encode_item_flags($item) { function encode_mail($item) { $x = array(); $x['type'] = 'mail'; + $x['encoding'] = 'zot'; if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) { $key = get_config('system','prvkey'); |