aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/contact_widgets.php10
-rw-r--r--include/socgraph.php10
2 files changed, 13 insertions, 7 deletions
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 4dab6a53e..42d3afdee 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -175,12 +175,16 @@ function common_friends_visitor_widget($profile_uid) {
return;
if($cid)
- $r = common_friends($profile_uid,$cid,5,true);
+ $r = common_friends($profile_uid,$cid,0,5,true);
else
- $r = common_friends_zcid($profile_uid,$zcid,5,true);
+ $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,
+ '$more' => t('show more'),
'$items' => $r
));
diff --git a/include/socgraph.php b/include/socgraph.php
index b7c4ccc71..592779089 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -184,7 +184,7 @@ function count_common_friends($uid,$cid) {
}
-function common_friends($uid,$cid,$limit=9999,$shuffle = false) {
+function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
if($shuffle)
$sql_extra = " order by rand() ";
@@ -195,11 +195,12 @@ function common_friends($uid,$cid,$limit=9999,$shuffle = false) {
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
where `glink`.`cid` = %d and `glink`.`uid` = %d
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d )
- $sql_extra limit 0, %d",
+ $sql_extra limit %d, %d",
intval($cid),
intval($uid),
intval($uid),
intval($cid),
+ intval($start),
intval($limit)
);
@@ -224,7 +225,7 @@ function count_common_friends_zcid($uid,$zcid) {
}
-function common_friends_zcid($uid,$zcid,$limit = 9999,$shuffle) {
+function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle) {
if($shuffle)
$sql_extra = " order by rand() ";
@@ -235,9 +236,10 @@ function common_friends_zcid($uid,$zcid,$limit = 9999,$shuffle) {
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
where `glink`.`zcid` = %d
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 )
- $sql_extra limit 0, %d",
+ $sql_extra limit %d, %d",
intval($zcid),
intval($uid),
+ intval($start),
intval($limit)
);