From a0668c8bbba43cb8b3b28d5a75d7d48f321e30f5 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Sep 2013 22:48:08 -0700 Subject: [PATCH] fix private message encryption since the input_filter mangled it --- include/items.php | 4 ++-- mod/item.php | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index 66172ade3..c15bf8205 100755 --- a/include/items.php +++ b/include/items.php @@ -1398,15 +1398,15 @@ function item_store($arr,$allow_exec = false) { $arr['item_flags'] = ((x($arr,'item_flags')) ? intval($arr['item_flags']) : 0 ); - $arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']); $arr['title'] = escape_tags($arr['title']); - // only detect language if we have text content, and if the post is private but not yet // obscured, make it so. if(! ($arr['item_flags'] & ITEM_OBSCURED)) { $arr['lang'] = detect_language($arr['body']); + // apply the input filter here - if it is obscured it has been filtered already + $arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']); $allowed_languages = get_pconfig($arr['uid'],'system','allowed_languages'); diff --git a/mod/item.php b/mod/item.php index da703e916..dc00efd35 100644 --- a/mod/item.php +++ b/mod/item.php @@ -611,6 +611,9 @@ function item_post(&$a) { $datarray['title'] = mb_substr($datarray['title'],0,255); if(array_key_exists('item_private',$datarray) && $datarray['item_private']) { + + $datarray['body'] = z_input_filter($datarray['uid'],$datarray['body'],$datarray['mimetype']); + logger('Encrypting local storage'); $key = get_config('system','pubkey'); $datarray['item_flags'] = $datarray['item_flags'] | ITEM_OBSCURED;