X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_widgets.php;h=ce1cdbad55e003b647a0ca75c83e2b8e11a337ef;hb=dafc84390db4b57e5958f1af386c778b481c7d04;hp=cfe27c5c9ba36997b4bb52e1583decd39360910b;hpb=b3680c0d266f06d2474cb45750b0486d246a8315;p=friendica.git

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index cfe27c5c9b..ce1cdbad55 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -143,14 +143,22 @@ function common_friends_visitor_widget($profile_uid) {
 	$cid = $zcid = 0;
 
 	if(can_write_wall($a,$profile_uid))
-		$cid = local_user();
+		$cid = remote_user();
 	else {
 		if(get_my_url()) {
-			$r = q("select id from gcontact where nurl = '%s' limit 1",
-				dbesc(normalise_link(get_my_url()))
+			$r = q("select id from contact where nurl = '%s' and uid = %d limit 1",
+				dbesc(normalise_link(get_my_url())),
+				intval($profile_uid)
 			);
 			if(count($r))
-				$zcid = $r[0]['id'];
+				$cid = $r[0]['id'];
+			else {
+				$r = q("select id from gcontact where nurl = '%s' limit 1",
+					dbesc(normalise_link(get_my_url()))
+				);
+				if(count($r))
+					$zcid = $r[0]['id'];
+			}
 		}
 	}
 
@@ -162,17 +170,22 @@ function common_friends_visitor_widget($profile_uid) {
 	if($cid)
 		$t = count_common_friends($profile_uid,$cid);
 	else
-		$t = count_common_friends($profile_uid,$cid);
+		$t = count_common_friends_zcid($profile_uid,$zcid);
 	if(! $t)
 		return;
 
 	if($cid)
-		$r = common_friends($profile_uid,$cid,5);
+		$r = common_friends($profile_uid,$cid,0,5,true);
 	else
-		$r = common_friends_zcid($profile_uid,$zcid);
+		$r = common_friends_zcid($profile_uid,$zcid,0,5,true);
 
 	return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
-		'$desc' =>  sprintf( tt("%d friend in common", "%d friends in common", $t), $t),
+		'$desc' =>  sprintf( tt("%d contact in common", "%d contacts in common", $t), $t),
+		'$base' => $a->get_baseurl(),
+		'$uid' => $profile_uid,
+		'$cid' => (($cid) ? $cid : '0'),
+		'$linkmore' => (($t > 5) ? 'true' : ''),
+		'$more' => t('show more'),
 		'$items' => $r
 	));