diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-12 14:38:48 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-12 14:38:48 -0400 |
| commit | a1183bf09a93459282078038b94ef89c00297604 (patch) | |
| tree | 2e14bec170e37c6615fcd5ff2892233ddffce452 /Zotlabs/Daemon/Notifier.php | |
| parent | 7fc2b13fe605ad461f6b6aeacd6a187c1ef794de (diff) | |
| parent | 1789c3242adcf11fe37f0ef0ec6180966853eeda (diff) | |
| download | volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.tar.gz volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.tar.bz2 volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.zip | |
Merge remote-tracking branch 'upstream/dev' into embedphotos
Diffstat (limited to 'Zotlabs/Daemon/Notifier.php')
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 6 |
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; } |