bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse source 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
This commit is contained in:
Roland Häder 2016-12-22 11:29:56 +01:00
commit c0df692f5f
16 changed files with 176 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/item.php
View file

@ -966,7 +966,7 @@ function item_post(App &$a) {
// Store the comment signature information in case we need to relay to Diaspora
diaspora::store_comment_signature($datarray, $author, ($self ? $user['prvkey'] : false), $post_id);
Diaspora::store_comment_signature($datarray, $author, ($self ? $user['prvkey'] : false), $post_id);
} else {
$parent = $post_id;