aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-09-30 16:19:39 +0200
committerMario <mario@mariovavti.com>2019-09-30 16:19:39 +0200
commitcf27b7440dace81d29358af38dd63ba2978eedb0 (patch)
tree9fa6fc6e944b47a0ed80851b63df3fe00126f2a3 /Zotlabs
parentd0055310baf8d608af8fc72976bfeaa242273a04 (diff)
parent407b9c9cd7ab3ef9ba77e6f719655354a7233920 (diff)
downloadvolse-hubzilla-cf27b7440dace81d29358af38dd63ba2978eedb0.tar.gz
volse-hubzilla-cf27b7440dace81d29358af38dd63ba2978eedb0.tar.bz2
volse-hubzilla-cf27b7440dace81d29358af38dd63ba2978eedb0.zip
Merge branch 'dev' into 'dev'
Sync private items with clones; avoid sync if no local connection with thread owner See merge request hubzilla/core!1739
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Item.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index d03b6ee30..cda8eabec 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -1232,13 +1232,7 @@ class Item extends Controller {
killme();
}
- if(($parent) && ($parent != $post_id)) {
- // Store the comment signature information in case we need to relay to Diaspora
- //$ditem = $datarray;
- //$ditem['author'] = $observer;
- //store_diaspora_comment_sig($ditem,$channel,$parent_item, $post_id, (($walltowall_comment) ? 1 : 0));
- }
- else {
+ if(($parent == $post_id) || ($datarray['item_private'] == 1)) {
$r = q("select * from item where id = %d",
intval($post_id)
);