diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-17 11:26:18 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-17 11:26:18 +0100 |
| commit | 256472f9eb3a1c929e5b43e2b6eb3bf0b0d5afe6 (patch) | |
| tree | 1f6778002328b27066ba86910f3f87bd060d6660 /include/items.php | |
| parent | af8449cef83376c65ff5ae9092dbe69f89294e69 (diff) | |
| parent | 9b3b2efe9aa374565c0c67bbc67c36f9c99d3add (diff) | |
| download | volse-hubzilla-256472f9eb3a1c929e5b43e2b6eb3bf0b0d5afe6.tar.gz volse-hubzilla-256472f9eb3a1c929e5b43e2b6eb3bf0b0d5afe6.tar.bz2 volse-hubzilla-256472f9eb3a1c929e5b43e2b6eb3bf0b0d5afe6.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php index 44f9633a9..0e16f7b8a 100755 --- a/include/items.php +++ b/include/items.php @@ -2160,7 +2160,7 @@ function encode_rel_links($links) { * * \e boolean \b success * * \e int \b item_id */ -function item_store($arr, $allow_exec = false) { +function item_store($arr, $allow_exec = false, $deliver = true) { $d = array('item' => $arr, 'allow_exec' => $allow_exec); call_hooks('item_store', $d ); @@ -2537,7 +2537,7 @@ function item_store($arr, $allow_exec = false) { // so that we have an item in the DB that's marked deleted and won't store a fresh post // that isn't aware that we were already told to delete it. - if(! intval($arr['item_deleted'])) { + if(($deliver) && (! intval($arr['item_deleted']))) { send_status_notifications($current_post,$arr); tag_deliver($arr['uid'],$current_post); } @@ -2550,7 +2550,7 @@ function item_store($arr, $allow_exec = false) { -function item_store_update($arr,$allow_exec = false) { +function item_store_update($arr,$allow_exec = false, $deliver = true) { $d = array('item' => $arr, 'allow_exec' => $allow_exec); call_hooks('item_store_update', $d ); @@ -2780,9 +2780,11 @@ function item_store_update($arr,$allow_exec = false) { call_hooks('post_remote_update_end',$arr); - send_status_notifications($orig_post_id,$arr); + if($deliver) { + send_status_notifications($orig_post_id,$arr); + tag_deliver($uid,$orig_post_id); + } - tag_deliver($uid,$orig_post_id); $ret['success'] = true; $ret['item_id'] = $orig_post_id; |