Merge remote-tracking branch 'upstream/master'

5 files changed, 17 insertions, 7 deletions

diff --git a/mod/cal.php b/mod/cal.php
index 9899b33b0..453f46f69 100755
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -80,12 +80,14 @@ function cal_content(&$a) {
 
 	$o = '';
 
+	$tabs = profile_tabs($a, True, $channel['channel_address']);
+
 	$mode = 'view';
 	$y = 0;
 	$m = 0;
 	$ignored = ((x($_REQUEST,'ignored')) ? " and ignored = " . intval($_REQUEST['ignored']) . " "  : '');
 
-logger('args: ' . print_r($a->argv,true));
+	// logger('args: ' . print_r($a->argv,true));
 
 	if(argc() > 3 && intval(argv(2)) && intval(argv(3))) {
 		$mode = 'view';
@@ -333,6 +335,7 @@ logger('args: ' . print_r($a->argv,true));
 			'$today'	=> t('Today'),
 			'$form'		=> $form,
 			'$expandform'	=> ((x($_GET,'expandform')) ? true : false),
+			'$tabs'		=> $tabs
 		));
 		
 		if (x($_GET,'id')){ echo $o; killme(); }
diff --git a/mod/events.php b/mod/events.php
index be39902aa..8e3b3e06b 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -299,7 +299,7 @@ function events_content(&$a) {
 	$ignored = ((x($_REQUEST,'ignored')) ? " and ignored = " . intval($_REQUEST['ignored']) . " "  : '');
 
 
-logger('args: ' . print_r($a->argv,true));
+	// logger('args: ' . print_r($a->argv,true));
 
 
 
diff --git a/mod/group.php b/mod/group.php
index 7eaad771f..c63ccfa9b 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -117,7 +117,7 @@ function group_content(&$a) {
 
 		check_form_security_token_ForbiddenOnErr('group_member_change', 't');
 
-		$r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_blocked = 0 and abook_pending = 0 limit 1",
+		$r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 limit 1",
 			dbesc(base64url_decode(argv(2))),
 			intval(local_channel())
 		);
@@ -208,7 +208,7 @@ function group_content(&$a) {
 			group_rmv_member(local_channel(),$group['name'],$member['xchan_hash']);
 	}
 
-	$r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND  abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc",
+	$r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND abook_self = 0 and abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc",
 		intval(local_channel())
 	);
 
diff --git a/mod/like.php b/mod/like.php
index ce8bc3063..26c39bf3b 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -107,13 +107,13 @@ function like_content(&$a) {
 				// to them.
 				$allow_cid = $allow_gid = $deny_cid = $deny_gid = '';
 				foreach($d as $dd) {
-					$allow_gid .= '<' . $dd['abook_xchan'] . '>';
+					$allow_cid .= '<' . $dd['abook_xchan'] . '>';
 				}
 			}
 			$post_type = t('channel');
 			$objtype = ACTIVITY_OBJ_PROFILE;
 
-
+			$profile = $r[0];
 		}
 		elseif($obj_type == 'thing') {
 
@@ -462,6 +462,13 @@ function like_content(&$a) {
 	if($obj_type === 'thing' && $r[0]['imgurl']) {
 		$arr['body'] .= "\n\n[zmg=80x80]" . $r[0]['imgurl'] . '[/zmg]';
 	}	
+	if($obj_type === 'profile') {
+		if($public) {
+			$arr['body'] .= "\n\n" . '[embed]' . z_root() . '/profile/' . $ch[0]['channel_address'] . '[/embed]';	
+		}
+		else
+			$arr['body'] .= "\n\n[zmg=80x80]" . $profile['thumb'] . '[/zmg]';
+	}	
 
 
 	$arr['verb']          = $activity;
diff --git a/mod/update_display.php b/mod/update_display.php
index b448c76ee..52903bb8c 100644
--- a/mod/update_display.php
+++ b/mod/update_display.php
@@ -39,4 +39,4 @@ function update_display_content(&$a) {
 //	logger('update_display: ' . $text);
 	killme();
 
-}
\ No newline at end of file
+}