diff options
author | redmatrix <git@macgirvin.com> | 2016-07-01 20:46:57 -0700 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-07-01 20:46:57 -0700 |
commit | 41fa2d6c697bc4f7483e6c934b24c11fae368390 (patch) | |
tree | 1b525525959fe39b1a57fa6abf1df3658d76869e | |
parent | 59474673395242f472124968e962702fb6b5f023 (diff) | |
download | volse-hubzilla-41fa2d6c697bc4f7483e6c934b24c11fae368390.tar.gz volse-hubzilla-41fa2d6c697bc4f7483e6c934b24c11fae368390.tar.bz2 volse-hubzilla-41fa2d6c697bc4f7483e6c934b24c11fae368390.zip |
delivery invoked twice in mod_tagger, once in post_activity_item() and another at the main module level
-rw-r--r-- | Zotlabs/Module/Tagger.php | 14 | ||||
-rwxr-xr-x | include/items.php | 6 |
2 files changed, 6 insertions, 14 deletions
diff --git a/Zotlabs/Module/Tagger.php b/Zotlabs/Module/Tagger.php index e1ed111a1..25f518d53 100644 --- a/Zotlabs/Module/Tagger.php +++ b/Zotlabs/Module/Tagger.php @@ -130,18 +130,14 @@ class Tagger extends \Zotlabs\Web\Controller { store_item_tag($item['uid'],$item['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$term,$tagid); $ret = post_activity_item($arr); - $r = $ret['item']; - if($r) { - build_sync_packet(local_channel(),[ - 'item' => [ - encode_item($,true) + if($ret['success']) { + build_sync_packet(local_channel(), + [ + 'item' => [ encode_item($ret['activity'],true) ] ] - ]); + ); } - if($ret['success']) - \Zotlabs\Daemon\Master::Summon(array('Notifier','tag',$ret['activity']['id'])); - killme(); } diff --git a/include/items.php b/include/items.php index 84683273d..48358c0e4 100755 --- a/include/items.php +++ b/include/items.php @@ -449,11 +449,7 @@ function post_activity_item($arr) { call_hooks('post_local_end', $arr); Zotlabs\Daemon\Master::Summon(array('Notifier','activity',$post_id)); $ret['success'] = true; - $r = q("select * from item where id = %d limit 1", - intval($post_id) - ); - if($r) - $ret['activity'] = $r[0]; + $ret['activity'] = $post['item']; } return $ret; |