diff options
| author | Andrew Manning <andrew@reticu.li> | 2016-11-30 21:22:51 -0500 |
|---|---|---|
| committer | Andrew Manning <andrew@reticu.li> | 2016-11-30 21:22:51 -0500 |
| commit | 3f838e1dbccab819ce0cf93b079afea8d41d2a7a (patch) | |
| tree | f76eb1fbb01cb3917474613c0f0bcfbe74ba0aa3 /include/conversation.php | |
| parent | 50a8ba8c18b081ce60ba7ab1a74ba30d8ff43794 (diff) | |
| parent | c845eed114ec3cea90acd35c419110d9ab76051f (diff) | |
| download | volse-hubzilla-3f838e1dbccab819ce0cf93b079afea8d41d2a7a.tar.gz volse-hubzilla-3f838e1dbccab819ce0cf93b079afea8d41d2a7a.tar.bz2 volse-hubzilla-3f838e1dbccab819ce0cf93b079afea8d41d2a7a.zip | |
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 16eacd73e..0f61eea27 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -363,7 +363,7 @@ function localize_item(&$item){ if(intval($item['item_obscured']) && strlen($item['body']) && (! strpos($item['body'],'data'))) { - $item['body'] = json_encode(crypto_encapsulate($item['body'],get_config('system','pubkey'), CRYPTO_ALGORITHM)); + $item['body'] = z_obscure($item['body']); } } |