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/connedit.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/connedit.php')
-rw-r--r-- | mod/connedit.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index d50783d31..008bc21ac 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -322,6 +322,9 @@ function connedit_clone(&$a) { if(! $a->poi) return; + + $channel = $a->get_channel(); + $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_id = %d LIMIT 1", @@ -338,6 +341,10 @@ function connedit_clone(&$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))); } |