diff options
author | zottel <github@zottel.net> | 2012-03-27 13:20:59 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-03-27 13:20:59 +0200 |
commit | fb817a29a934a68f194a42c29d3ed11da2da558f (patch) | |
tree | fdeb88be9d8545ead92c5d63a9d9af7f6a7ccc23 /include/socgraph.php | |
parent | fabd4f4d2ebd9d1623db7e20d6e4e8f6bd0611ff (diff) | |
parent | 928e6c7ef78d251429a7d5c1fd4fdb8e6c282d41 (diff) | |
download | volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.tar.gz volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.tar.bz2 volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/socgraph.php')
-rwxr-xr-x | include/socgraph.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/socgraph.php b/include/socgraph.php index b2f545509..3f5194049 100755 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -237,12 +237,14 @@ function suggestion_query($uid, $start = 0, $limit = 80) { $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 = 80) { $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) ); |