diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/diaspora.php | 14 | ||||
| -rw-r--r-- | include/zot.php | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 4766a75f6..d59da6fff 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -813,11 +813,25 @@ function diaspora_request($importer,$xml) { 'link' => z_root() . '/connedit/' . $new_connection[0]['abook_id'], )); + if($default_perms) { // Send back a sharing notification to them diaspora_share($importer,$new_connection[0]); } + + $clone = array(); + foreach($new_connection[0] as $k => $v) { + if(strpos($k,'abook_') === 0) { + $clone[$k] = $v; + } + } + unset($clone['abook_id']); + unset($clone['abook_account']); + unset($clone['abook_channel']); + + build_sync_packet($importer['channel_id'], array('abook' => array($clone))); + } } diff --git a/include/zot.php b/include/zot.php index 9497e4668..31a12b763 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2907,7 +2907,6 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { $abook['abook_feed'] = 1; } - $clean = array(); if($abook['abook_xchan'] && $abook['entry_deleted']) { logger('process_channel_sync_delivery: removing abook entry for ' . $abook['abook_xchan']); |