diff options
| author | zottel <github@zottel.net> | 2012-04-28 02:30:20 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-28 02:30:20 +0200 |
| commit | 43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720 (patch) | |
| tree | f23edf82793ede551df581a36f8bc2370770c092 /include/text.php | |
| parent | edc7e571b710d0ce24587c529d6e51ee7781d638 (diff) | |
| parent | c3f70a9e56151b8594b3485cc8b12e4d26ac6773 (diff) | |
| download | volse-hubzilla-43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720.tar.gz volse-hubzilla-43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720.tar.bz2 volse-hubzilla-43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720.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 8c8db66a9..af32b2476 100644 --- a/include/text.php +++ b/include/text.php @@ -558,7 +558,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 AND `hidden` = 0", + $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0", intval($a->profile['uid']) ); if(count($r)) { @@ -569,7 +569,7 @@ function contact_block() { $micropro = Null; } else { - $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", + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ORDER BY RAND() LIMIT %d", intval($a->profile['uid']), intval($shown) ); |