diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-09-02 13:15:59 +0200 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-09-02 13:15:59 +0200 |
| commit | fee5b6bd1599599da2f3b662f04b9651b23fb4e4 (patch) | |
| tree | e4ab47f657ce1e6ae0aabf6be51bdf169e4b389d /mod/item.php | |
| parent | a1f85cda3ec0e6fc1c661ee12b1e7d87b3f242c5 (diff) | |
| parent | 9dac46ca25b11f80dded42db31e7e062fc7b5142 (diff) | |
| download | volse-hubzilla-fee5b6bd1599599da2f3b662f04b9651b23fb4e4.tar.gz volse-hubzilla-fee5b6bd1599599da2f3b662f04b9651b23fb4e4.tar.bz2 volse-hubzilla-fee5b6bd1599599da2f3b662f04b9651b23fb4e4.zip | |
Merge pull request #2 from friendica/master
Merge from main project
Diffstat (limited to 'mod/item.php')
| -rw-r--r-- | mod/item.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mod/item.php b/mod/item.php index 92dc3e7c6..c1dd15eb1 100644 --- a/mod/item.php +++ b/mod/item.php @@ -768,9 +768,9 @@ function item_post(&$a) { $key = get_config('system','pubkey'); $datarray['item_flags'] = $datarray['item_flags'] | ITEM_OBSCURED; if($datarray['title']) - $datarray['title'] = json_encode(aes_encapsulate($datarray['title'],$key)); + $datarray['title'] = json_encode(crypto_encapsulate($datarray['title'],$key)); if($datarray['body']) - $datarray['body'] = json_encode(aes_encapsulate($datarray['body'],$key)); + $datarray['body'] = json_encode(crypto_encapsulate($datarray['body'],$key)); } if($orig_post) { @@ -790,7 +790,6 @@ function item_post(&$a) { else $post_id = 0; - $post = item_store($datarray,$execflag); $post_id = $post['item_id']; @@ -852,6 +851,11 @@ function item_post(&$a) { // NOTREACHED } + if($parent) { + // Store the comment signature information in case we need to relay to Diaspora +//FIXME + store_diaspora_comment_sig($datarray,$channel,$parent_item, $post_id); + } update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid); @@ -1313,3 +1317,4 @@ function item_check_service_class($channel_id,$iswebpage) { $ret['success'] = true; return $ret; } + |