diff options
author | zotlabs <mike@macgirvin.com> | 2017-06-11 16:25:14 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-06-11 16:25:14 -0700 |
commit | f28fa0ab5a46a231695a851f2345a3669419c842 (patch) | |
tree | dfde598a178d05e4277caa29f6c732f59d965c14 /include/conversation.php | |
parent | 61bf77f668023da328acb386d586be843d7b382b (diff) | |
parent | 643a62038e002c8944dda37f4023129bb50272c1 (diff) | |
download | volse-hubzilla-f28fa0ab5a46a231695a851f2345a3669419c842.tar.gz volse-hubzilla-f28fa0ab5a46a231695a851f2345a3669419c842.tar.bz2 volse-hubzilla-f28fa0ab5a46a231695a851f2345a3669419c842.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/conversation.php')
-rw-r--r-- | include/conversation.php | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/conversation.php b/include/conversation.php index c325a516f..3f9ee5cfa 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -353,14 +353,6 @@ function localize_item(&$item){ } */ - // if item body was obscured and we changed it, re-obscure it - // FIXME - we need a better filter than just the string 'data'; try and - // match the fact that it's json encoded - - if(intval($item['item_obscured']) - && strlen($item['body']) && (! strpos($item['body'],'data'))) { - $item['body'] = z_obscure($item['body']); - } } |