Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts:
	mod/like.php

mod/like.php

@@ -508,6 +508,14 @@ function like_content(&$a) {
 			dbesc(($tgttype)? $tgttype : $objtype),
 			dbesc($obj_id)
 		);
+		$r = q("select * from likes where liker = '%s' and likee = '%s' and i_mid = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' ",
+			dbesc($observer['xchan_hash']),
+			dbesc($ch[0]['channel_hash']),
+			dbesc($mid),
+			dbesc($activity),
+			dbesc(($tgttype)? $tgttype : $objtype),
+			dbesc($obj_id)
+		);
 		if($r)
 			build_sync_packet($ch[0]['channel_id'],array('likes' => $r));