diff options
| author | Michael <icarus@dabo.de> | 2012-04-11 18:47:21 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-04-11 18:47:21 +0200 |
| commit | c3139fa0fd49b0b4de4568d46a6946c75ccb2a62 (patch) | |
| tree | a46d809d2e11fefba938717d38b1371572e4d815 /include/socgraph.php | |
| parent | 81a8d4f9dbd32de133e647c87a5394dd52f009fe (diff) | |
| parent | fe257a20324fe68838e5829e19d18777045a41b4 (diff) | |
| download | volse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.tar.gz volse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.tar.bz2 volse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.zip | |
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'include/socgraph.php')
| -rw-r--r--[-rwxr-xr-x] | include/socgraph.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/socgraph.php b/include/socgraph.php index 79d7340a4..3f5194049 100755..100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -230,19 +230,21 @@ function all_friends($uid,$cid,$start = 0, $limit = 80) { -function suggestion_query($uid, $start = 0, $limit = 40) { +function suggestion_query($uid, $start = 0, $limit = 80) { if(! $uid) return array(); $r = q("SELECT count(glink.gcid) as `total`, gcontact.* from gcontact left join glink on glink.gcid = gcontact.id - where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d) + where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d ) + and not gcontact.name in ( select name from contact where uid = %d ) and not gcontact.id in ( select gcid from gcign where uid = %d ) group by glink.gcid order by total desc limit %d, %d ", intval($uid), intval($uid), intval($uid), + intval($uid), intval($start), intval($limit) ); @@ -252,11 +254,13 @@ function suggestion_query($uid, $start = 0, $limit = 40) { $r2 = q("SELECT gcontact.* from gcontact left join glink on glink.gcid = gcontact.id - where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d) + where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d ) + and not gcontact.name in ( select name from contact where uid = %d ) and not gcontact.id in ( select gcid from gcign where uid = %d ) order by rand() limit %d, %d ", intval($uid), intval($uid), + intval($uid), intval($start), intval($limit) ); |