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/connedit.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/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))); } |