aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Daemon/Notifier.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-06-09 20:07:09 -0400
committerAndrew Manning <tamanning@zoho.com>2016-06-09 20:07:09 -0400
commit7a242f829fac2b434726c2bbdca5dbf658404c76 (patch)
tree5b7b4d086dccac5017fcb31211a27d689cb8e21f /Zotlabs/Daemon/Notifier.php
parent9410b63bbc819955964706c876bc2f7ecea10adf (diff)
parentee5372784e129ed7a162c7433f56fa3a1e877a67 (diff)
downloadvolse-hubzilla-7a242f829fac2b434726c2bbdca5dbf658404c76.tar.gz
volse-hubzilla-7a242f829fac2b434726c2bbdca5dbf658404c76.tar.bz2
volse-hubzilla-7a242f829fac2b434726c2bbdca5dbf658404c76.zip
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'Zotlabs/Daemon/Notifier.php')
-rw-r--r--Zotlabs/Daemon/Notifier.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 590be31ee..ebc9d83a5 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -278,7 +278,11 @@ class Notifier {
logger('notifier: target item not forwardable: type ' . $target_item['item_type'], LOGGER_DEBUG);
return;
}
- if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed']) || intval($target_item['item_hidden'])) {
+
+ // Check for non published items, but allow an exclusion for transmitting hidden file activities
+
+ if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed']) ||
+ ( intval($target_item['item_hidden']) && ($target_item['obj_type'] !== ACTIVITY_OBJ_FILE))) {
logger('notifier: target item not published, so not forwardable', LOGGER_DEBUG);
return;
}