diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-04 17:03:23 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-04 17:03:23 -0400 |
| commit | 5830c32dceb2429656ee4957690dd78c24641f02 (patch) | |
| tree | f71428787e701421068ce53e446bed47b7078fcf /include/socgraph.php | |
| parent | 00190b7faab2baf21523a7243268057142f6de88 (diff) | |
| parent | 37d4181fde392b5d31d77531255b345d9a0e718b (diff) | |
| download | volse-hubzilla-5830c32dceb2429656ee4957690dd78c24641f02.tar.gz volse-hubzilla-5830c32dceb2429656ee4957690dd78c24641f02.tar.bz2 volse-hubzilla-5830c32dceb2429656ee4957690dd78c24641f02.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
category removal
Esperanto 100%
"show more" friends in common
* master:
Diffstat (limited to 'include/socgraph.php')
| -rw-r--r-- | include/socgraph.php | 10 |
1 files changed, 6 insertions, 4 deletions
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) ); |