From 2fe6aef8bc41db07cfac094f9ede7b06a52e0ade Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
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/ItemObject.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'include/ItemObject.php')

diff --git a/include/ItemObject.php b/include/ItemObject.php
index 6dbb38564..6088a2c1c 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -27,7 +27,7 @@ class Item extends BaseObject {
 	private $threaded = false;
 	private $visiting = false;
 	private $channel = null;
-	private $cipher = 'aes256';
+
 
 	public function __construct($data) {
 		$a = $this->get_app();
@@ -35,11 +35,6 @@ class Item extends BaseObject {
 		$this->data = $data;
 		$this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
 
-		$cipher = get_pconfig($x['profile_uid'],'system','default_cipher');
-		if($cipher)
-			$this->cipher = $cipher;
-
-
 		// Prepare the children
 		if(count($data['children'])) {
 			foreach($data['children'] as $item) {
@@ -545,7 +540,7 @@ class Item extends BaseObject {
 			'$indent' => $indent,
 			'$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false),
 			'$encrypt' => t('Encrypt text'),
-			'$cipher' => $this->cipher,
+			'$cipher' => $conv->get_cipher(),
 			'$sourceapp' => get_app()->sourcename
 
 		));
-- 
cgit v1.2.3