diff options
| author | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-03-01 22:09:06 +0100 |
|---|---|---|
| committer | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-03-01 22:09:06 +0100 |
| commit | 8b61e546fe488516fa3c5f37df80a68e346b84a9 (patch) | |
| tree | 8af09fcff55cd613d5d2557a7c0956bd25a4afa3 /mod/follow.php | |
| parent | 7206e8af3a943b0fb286f253ed3abbda2d2572b6 (diff) | |
| parent | 7808689198601780041e022bf0698e559869f305 (diff) | |
| download | volse-hubzilla-8b61e546fe488516fa3c5f37df80a68e346b84a9.tar.gz volse-hubzilla-8b61e546fe488516fa3c5f37df80a68e346b84a9.tar.bz2 volse-hubzilla-8b61e546fe488516fa3c5f37df80a68e346b84a9.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
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))); |