diff options
| author | marijus <mario@mariovavti.com> | 2014-08-24 09:35:21 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-08-24 09:35:21 +0200 |
| commit | f991ca8df127dd90e12c00b5d39e22603e4e425a (patch) | |
| tree | 68518e3c2b71ba9d7cb1ebfa06a4484f3d1e5bcd /include | |
| parent | 8d382a9394a1b3b32fcd40553add9520e076ab68 (diff) | |
| parent | 9b524c9bc4553a82b98f46e4c4804d76ee1495f2 (diff) | |
| download | volse-hubzilla-f991ca8df127dd90e12c00b5d39e22603e4e425a.tar.gz volse-hubzilla-f991ca8df127dd90e12c00b5d39e22603e4e425a.tar.bz2 volse-hubzilla-f991ca8df127dd90e12c00b5d39e22603e4e425a.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index 1f2b33579..f10a5c570 100755 --- a/include/items.php +++ b/include/items.php @@ -132,6 +132,7 @@ function can_comment_on_post($observer_xchan,$item) { // false. return false; break; + case 'any connections': case 'contacts': case '': if(array_key_exists('owner',$item)) { @@ -318,9 +319,9 @@ function post_activity_item($arr) { $key = get_config('system','pubkey'); $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED; if($arr['title']) - $arr['title'] = json_encode(aes_encapsulate($arr['title'],$key)); + $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key)); if($arr['body']) - $arr['body'] = json_encode(aes_encapsulate($arr['body'],$key)); + $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key)); } $arr['mid'] = ((x($arr,'mid')) ? $arr['mid'] : item_message_id()); @@ -2713,9 +2714,9 @@ function start_delivery_chain($channel,$item,$item_id,$parent) { $key = get_config('system','pubkey'); $flag_bits = $flag_bits|ITEM_OBSCURED; if($title) - $title = json_encode(aes_encapsulate($title,$key)); + $title = json_encode(crypto_encapsulate($title,$key)); if($body) - $body = json_encode(aes_encapsulate($body,$key)); + $body = json_encode(crypto_encapsulate($body,$key)); } } else { |