aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-16 06:42:08 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-16 06:42:08 +0100
commit69487389d362285aeeb5106097864ec982c08a59 (patch)
treef5eede7c0a6a5ade0b097b6646f8de2cb33ba5e5 /include/items.php
parentfd5d1416d9a65206879588ff195a8e1d3b49c008 (diff)
parent0cb5f009b483ff570ded4570bb45023573531494 (diff)
downloadvolse-hubzilla-69487389d362285aeeb5106097864ec982c08a59.tar.gz
volse-hubzilla-69487389d362285aeeb5106097864ec982c08a59.tar.bz2
volse-hubzilla-69487389d362285aeeb5106097864ec982c08a59.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/items.php')
-rwxr-xr-xinclude/items.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index 3e4805212..43bbdda28 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2962,9 +2962,12 @@ function tag_deliver($uid, $item_id) {
if(($item['source_xchan']) && intval($item['item_uplink'])
&& intval($item['item_thread_top']) && ($item['edited'] != $item['created'])) {
+
// this is an update (edit) to a post which was already processed by us and has a second delivery chain
// Just start the second delivery chain to deliver the updated post
- proc_run('php','include/notifier.php','tgroup',$item['id']);
+ // after resetting ownership and permission bits
+
+ start_delivery_chain($u[0], $item, $item_id, 0);
return;
}
@@ -3181,7 +3184,7 @@ function tag_deliver($uid, $item_id) {
}
if((! $mention) && (! $union)) {
- logger('tag_deliver: no mention and no union.');
+ logger('tag_deliver: no mention for ' . $u[0]['channel_name'] . ' and no union.');
return;
}