aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-07-31 17:23:33 -0700
committerzotlabs <mike@macgirvin.com>2017-07-31 17:23:33 -0700
commit9476c631b0f9ba52be869b0c430fea81f4202352 (patch)
tree74bc7e214224bddf16ddc75f42ccb1a7e08da2ec /include
parent445fa6825a20876441d07c28f7b7bbd2c8fd064c (diff)
parentb66cd8363e19a05853876dd3146dd64bb7e683d2 (diff)
downloadvolse-hubzilla-9476c631b0f9ba52be869b0c430fea81f4202352.tar.gz
volse-hubzilla-9476c631b0f9ba52be869b0c430fea81f4202352.tar.bz2
volse-hubzilla-9476c631b0f9ba52be869b0c430fea81f4202352.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include')
-rw-r--r--include/attach.php23
1 files changed, 3 insertions, 20 deletions
diff --git a/include/attach.php b/include/attach.php
index 75235d7e1..d19de2ea3 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -1684,17 +1684,9 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
$arr['obj'] = $u_jsonobject;
$arr['body'] = '';
- $post = item_store($arr);
- $item_id = $post['item_id'];
- if($item_id) {
- Zotlabs\Daemon\Master::Summon(array('Notifier','activity',$item_id));
- }
-
- call_hooks('post_local_end', $arr);
+ post_activity_item($arr);
$update = false;
-
- //notice( t('File activity updated') . EOL);
}
//don't create new activity if notify was not enabled
@@ -1719,16 +1711,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
$arr['obj'] = (($update) ? $u_jsonobject : $jsonobject);
$arr['body'] = '';
- $post = item_store($arr);
- $item_id = $post['item_id'];
-
- if($item_id) {
- Zotlabs\Daemon\Master::Summon(array('Notifier','activity',$item_id));
- }
-
- call_hooks('post_local_end', $arr);
-
- //(($verb === 'post') ? notice( t('File activity posted') . EOL) : notice( t('File activity dropped') . EOL));
+ post_activity_item($arr);
return;
}
@@ -1894,7 +1877,7 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
//if none is allowed restrict to self
if(($r_arr_allow_gid === false) && ($r_arr_allow_cid === false)) {
- $ret['allow_cid'] = $poster['xchan_hash'];
+ $ret['allow_cid'] = [$poster['xchan_hash']];
} else {
$ret['allow_gid'] = $r_arr_allow_gid;
$ret['allow_cid'] = $r_arr_allow_cid;