diff options
| author | zotlabs <mike@macgirvin.com> | 2017-04-19 17:52:15 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-04-19 17:52:15 -0700 |
| commit | 1c6d2857cb6978ca7b87a0564013aa2b39024e96 (patch) | |
| tree | ed4c6ddff0ff82a7dc1a59a2269a10590484339a | |
| parent | 397fef519c7929c70636c50015f7a0389062bab5 (diff) | |
| download | volse-hubzilla-1c6d2857cb6978ca7b87a0564013aa2b39024e96.tar.gz volse-hubzilla-1c6d2857cb6978ca7b87a0564013aa2b39024e96.tar.bz2 volse-hubzilla-1c6d2857cb6978ca7b87a0564013aa2b39024e96.zip | |
follow_from_feed issue when called from push
| -rw-r--r-- | include/feedutils.php | 2 | ||||
| -rw-r--r-- | include/follow.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/feedutils.php b/include/feedutils.php index a5161dc6e..03eb1f256 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -946,7 +946,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { $datarray['author_xchan'] = ''; if(activity_match($datarray['verb'],ACTIVITY_FOLLOW) && $datarray['obj_type'] === ACTIVITY_OBJ_PERSON) { - $cb = array('item' => $datarray,'channel' => $importer, 'xchan' => null, 'author' => $author, 'caught' => false); + $cb = array('item' => $datarray,'channel' => $importer, 'xchan' => [ 'placeholder' => '' ], 'author' => $author, 'caught' => false); call_hooks('follow_from_feed',$cb); if($cb['caught']) { if($cb['return_code']) diff --git a/include/follow.php b/include/follow.php index 751d86db1..0d7c16aa3 100644 --- a/include/follow.php +++ b/include/follow.php @@ -49,7 +49,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $arr = array('url' => $url, 'channel' => array()); - call_hooks('follow', $arr); + call_hooks('follow_init', $arr); if($arr['channel']['success']) $ret = $arr['channel']; |