diff options
| author | zotlabs <mike@macgirvin.com> | 2017-06-20 18:34:17 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-06-20 18:34:17 -0700 |
| commit | 08c0729f5ff8ac97c27db08ae2dde1a052c71e25 (patch) | |
| tree | 9ce2ee515601a79156e89e5158fc3b8047f6e90a /Zotlabs/Daemon/Notifier.php | |
| parent | 234c64574b4ee5ca22b85ae2fecc301286423068 (diff) | |
| parent | 76e98091690cf5f2726bf7cefea217d49b23a5b4 (diff) | |
| download | volse-hubzilla-08c0729f5ff8ac97c27db08ae2dde1a052c71e25.tar.gz volse-hubzilla-08c0729f5ff8ac97c27db08ae2dde1a052c71e25.tar.bz2 volse-hubzilla-08c0729f5ff8ac97c27db08ae2dde1a052c71e25.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Daemon/Notifier.php')
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 3afe1a5dc..16246b081 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -270,7 +270,8 @@ class Notifier { // 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']) || + if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed']) || + intval($target_item['item_blocked']) || ( intval($target_item['item_hidden']) && ($target_item['obj_type'] !== ACTIVITY_OBJ_FILE))) { logger('notifier: target item not published, so not forwardable', LOGGER_DEBUG); return; |