Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/zot.php

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)));
+
 		}
 	}
 

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']);