aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-04-20 10:08:10 +0200
committerGitHub <noreply@github.com>2017-04-20 10:08:10 +0200
commit35110b6327514adbee7d930cd9d934a08e194c40 (patch)
tree42ca98195d4856533a093a4e6cf112b3287b70a8
parent09967598e15eb5d201bcc676ffb329b97e1b89b8 (diff)
parent40f6280c48e7b5720211dd801f0bfa851658fa44 (diff)
downloadvolse-hubzilla-35110b6327514adbee7d930cd9d934a08e194c40.tar.gz
volse-hubzilla-35110b6327514adbee7d930cd9d934a08e194c40.tar.bz2
volse-hubzilla-35110b6327514adbee7d930cd9d934a08e194c40.zip
Merge pull request #723 from zotlabs/followfeed
follow_from_feed issue when called from push
-rw-r--r--include/feedutils.php2
-rw-r--r--include/follow.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/feedutils.php b/include/feedutils.php
index 1865dfb27..0e6978d39 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'];