diff options
| author | zottel <github@zottel.net> | 2011-12-06 00:02:29 -0800 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2011-12-06 00:02:29 -0800 |
| commit | cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa (patch) | |
| tree | 2efc84f14303c5d8dd283a93b64f02851e969e3f /include/text.php | |
| parent | c5c99089ff363831f199e27c188410fec682fda5 (diff) | |
| parent | 47f369e052d296f4a744c1508efc58f6168b7e8b (diff) | |
| download | volse-hubzilla-cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa.tar.gz volse-hubzilla-cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa.tar.bz2 volse-hubzilla-cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php index c4fd76e3e..29e53c663 100644 --- a/include/text.php +++ b/include/text.php @@ -539,7 +539,7 @@ function contact_block() { if((! is_array($a->profile)) || ($a->profile['hide-friends'])) return $o; - $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0", + $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0", intval($a->profile['uid']) ); if(count($r)) { @@ -550,7 +550,7 @@ function contact_block() { $micropro = Null; } else { - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 ORDER BY RAND() LIMIT %d", + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 ORDER BY RAND() LIMIT %d", intval($a->profile['uid']), intval($shown) ); |