aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-11-06 21:56:16 -0800
committerzotlabs <mike@macgirvin.com>2017-11-06 21:56:16 -0800
commit7b69dc574b1527fc0e16a0c2f91a726132987e2f (patch)
treeb97753197fe8aa4012bbdaaa2039bf722da55d78 /include
parent5376a734d45554fafacb674a725dc2831db1bf14 (diff)
parentd16bbfb224c218b04676d890c647b6d1c5d92273 (diff)
downloadvolse-hubzilla-7b69dc574b1527fc0e16a0c2f91a726132987e2f.tar.gz
volse-hubzilla-7b69dc574b1527fc0e16a0c2f91a726132987e2f.tar.bz2
volse-hubzilla-7b69dc574b1527fc0e16a0c2f91a726132987e2f.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include')
-rw-r--r--include/attach.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/attach.php b/include/attach.php
index ab9a15ec2..179a57a90 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -947,9 +947,9 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
}
if($notify) {
- //$cloudPath = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['0']['display_path'];
- //$object = get_file_activity_object($channel['channel_id'], $r['0']['hash'], $cloudPath);
- //file_activity($channel['channel_id'], $object, $r['0']['allow_cid'], $r['0']['allow_gid'], $r['0']['deny_cid'], $r['0']['deny_gid'], 'post', $notify);
+ $cloudPath = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['0']['display_path'];
+ $object = get_file_activity_object($channel['channel_id'], $r['0']['hash'], $cloudPath);
+ file_activity($channel['channel_id'], $object, $r['0']['allow_cid'], $r['0']['allow_gid'], $r['0']['deny_cid'], $r['0']['deny_gid'], 'post', $notify);
}
return $ret;
@@ -1421,7 +1421,7 @@ function attach_delete($channel_id, $resource, $is_photo = 0) {
intval($channel_id)
);
- file_activity($channel_id, $object, $object['allow_cid'], $object['allow_gid'], $object['deny_cid'], $object['deny_gid'], 'update', $notify=1);
+ file_activity($channel_id, $object, $object['allow_cid'], $object['allow_gid'], $object['deny_cid'], $object['deny_gid'], 'update', true);
return;
}