diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2014-03-09 04:15:11 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2014-03-09 04:15:11 +0100 |
| commit | 76ab9403af3b562531a7eb0831e5a7ecc9aedb38 (patch) | |
| tree | c4d74f0cc8aac0fcd5a52520170a64c8d4b01395 /include/text.php | |
| parent | e8e980c8175be6dae7d642d9707493c465b7137b (diff) | |
| parent | 80e381176e1e301782bc56cbb7c6037825eddf2d (diff) | |
| download | volse-hubzilla-76ab9403af3b562531a7eb0831e5a7ecc9aedb38.tar.gz volse-hubzilla-76ab9403af3b562531a7eb0831e5a7ecc9aedb38.tar.bz2 volse-hubzilla-76ab9403af3b562531a7eb0831e5a7ecc9aedb38.zip | |
merge
Diffstat (limited to 'include/text.php')
| -rwxr-xr-x | include/text.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/text.php b/include/text.php index dfd35c769..839e63f5e 100755 --- a/include/text.php +++ b/include/text.php @@ -665,8 +665,11 @@ function contact_block() { if((! is_array($a->profile)) || ($a->profile['hide_friends'])) return $o; - $r = q("SELECT COUNT(abook_id) AS total FROM abook WHERE abook_channel = %d and abook_flags = 0", - intval($a->profile['uid']) + $r = q("SELECT COUNT(abook_id) AS total FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_flags = 0 and not (xchan_flags & %d) and not (xchan_flags & %d) and not (xchan_flags & %d)", + intval($a->profile['uid']), + intval(XCHAN_FLAGS_HIDDEN), + intval(XCHAN_FLAGS_ORPHAN), + intval(XCHAN_FLAGS_DELETED) ); if(count($r)) { $total = intval($r[0]['total']); @@ -677,8 +680,11 @@ function contact_block() { } else { - $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d AND abook_flags = 0 ORDER BY RAND() LIMIT %d", + $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d AND abook_flags = 0 and not (xchan_flags & %d ) and not (xchan_flags & %d ) and not (xchan_flags & %d ) ORDER BY RAND() LIMIT %d", intval($a->profile['uid']), + intval(XCHAN_FLAGS_HIDDEN), + intval(XCHAN_FLAGS_ORPHAN), + intval(XCHAN_FLAGS_DELETED), intval($shown) ); |