From dc46a01cd467ac8c03acda6abcdb3aa56ef2db77 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 18 Dec 2011 13:03:20 -0800 Subject: [PATCH] suggest query for no friends messed up --- include/socgraph.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/include/socgraph.php b/include/socgraph.php index 78a5514a0d..5420b06c89 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -231,20 +231,22 @@ function suggestion_query($uid, $start = 0, $limit = 40) { intval($limit) ); - if(count($r)) + if(count($r) && count($r) >= ($limit -1)) return $r; - $r = q("SELECT gcontact.* from gcontact + $r2 = q("SELECT gcontact.* from gcontact left join glink on glink.gcid = gcontact.id - where uid = 0 and 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.id in ( select gcid from gcign where uid = %d ) - order by rand limit %d, %d ", + order by rand() limit %d, %d ", + intval($uid), intval($uid), intval($start), intval($limit) ); - return $r; + + return array_merge($r,$r2); }