diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-03-02 06:06:39 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-03-02 06:06:39 +0100 |
| commit | 264abef81761a3ed0d27126dbc5a6e0a47fb8ec8 (patch) | |
| tree | 883418e21b721217b28380f9313405373825650a /mod/follow.php | |
| parent | e084a85e79af2c56f6e715fcf44a1be815ea5c45 (diff) | |
| parent | a0baa480e3968306c8ebc297a60f84b4d2ccf8c9 (diff) | |
| download | volse-hubzilla-264abef81761a3ed0d27126dbc5a6e0a47fb8ec8.tar.gz volse-hubzilla-264abef81761a3ed0d27126dbc5a6e0a47fb8ec8.tar.bz2 volse-hubzilla-264abef81761a3ed0d27126dbc5a6e0a47fb8ec8.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/follow.php')
| -rw-r--r-- | mod/follow.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mod/follow.php b/mod/follow.php index 3ad2cb3bb..73e87c16f 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -14,7 +14,9 @@ function follow_init(&$a) { $return_url = $_SESSION['return_url']; $confirm = intval($_REQUEST['confirm']); - $result = new_contact($uid,$url,$a->get_channel(),true,$confirm); + $channel = $a->get_channel(); + + $result = new_contact($uid,$url,$channel,true,$confirm); if($result['success'] == false) { if($result['message']) @@ -34,6 +36,10 @@ function follow_init(&$a) { unset($clone['abook_account']); unset($clone['abook_channel']); + $abconfig = load_abconfig($channel['channel_hash'],$clone['abook_xchan']); + if($abconfig) + $clone['abconfig'] = $abconfig; + build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone))); |