From 2fe6aef8bc41db07cfac094f9ede7b06a52e0ade Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 14 Nov 2013 22:54:16 -0800 Subject: fix default cipher for comments and set it at the conversation level rather than the item level. --- include/ConversationObject.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'include/ConversationObject.php') diff --git a/include/ConversationObject.php b/include/ConversationObject.php index d8c6bca77..103c3664b 100644 --- a/include/ConversationObject.php +++ b/include/ConversationObject.php @@ -23,7 +23,7 @@ class Conversation extends BaseObject { private $profile_owner = 0; private $preview = false; private $prepared_item = ''; - + private $cipher = 'aes256'; // $prepared_item is for use by alternate conversation structures such as photos // wherein we've already prepared a top level item which doesn't look anything like @@ -33,6 +33,9 @@ class Conversation extends BaseObject { $this->set_mode($mode); $this->preview = $preview; $this->prepared_item = $prepared_item; + $c = ((local_user()) ? get_pconfig(local_user(),'system','default_cipher') : ''); + if($c) + $this->cipher = $c; } /** @@ -118,6 +121,10 @@ class Conversation extends BaseObject { return $this->observer; } + public function get_cipher() { + return $this->cipher; + } + /** * Add a thread to the conversation -- cgit v1.2.3