aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-08-25 02:14:48 -0700
committerfriendica <info@friendica.com>2014-08-25 02:14:48 -0700
commit86fb165dc98e096c71cd94ccfccea29283e42f4b (patch)
treee3ad483db86b850da7563c0dba1686cf84216308
parente0ee66d0b40247e05d4cbc1ca7687b74b1bc88d9 (diff)
downloadvolse-hubzilla-86fb165dc98e096c71cd94ccfccea29283e42f4b.tar.gz
volse-hubzilla-86fb165dc98e096c71cd94ccfccea29283e42f4b.tar.bz2
volse-hubzilla-86fb165dc98e096c71cd94ccfccea29283e42f4b.zip
re-obscure item body if localize_item() changes it. It's already flagged as obscured so we need it to actually be obscured.
-rw-r--r--include/conversation.php13
-rw-r--r--version.inc2
2 files changed, 14 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index daf1c723f..b14e609dd 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -262,6 +262,8 @@ function localize_item(&$item){
$item['body'] = sprintf($txt, $A, t($verb));
}
+
+
/*
// FIXME store parent item as object or target
// (and update to json storage)
@@ -363,6 +365,17 @@ function localize_item(&$item){
// if($sparkle)
// $item['plink'] = $y . '?f=&url=' . $item['plink'];
// }
+
+ // 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(($item['item_flags'] & ITEM_OBSCURED)
+ && strlen($item['body']) && (! strpos($item['body'],'data'))) {
+ $item['body'] = json_encode(crypto_encapsulate($item['body'],get_config('system','pubkey')));
+ }
+
+
}
/**
diff --git a/version.inc b/version.inc
index 5eaf3e43a..ccd4c24d1 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-08-24.777
+2014-08-25.778