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/api.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/api.php')
| -rw-r--r-- | include/api.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/api.php b/include/api.php index 1196e0aac..9cf4551bd 100644 --- a/include/api.php +++ b/include/api.php @@ -296,7 +296,7 @@ // count friends $r = q("SELECT COUNT(`id`) as `count` FROM `contact` WHERE `uid` = %d AND `rel` IN ( %d, %d ) - AND `self`=0 AND `blocked`=0", + AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0", intval($uinfo[0]['uid']), intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND) @@ -305,7 +305,7 @@ $r = q("SELECT COUNT(`id`) as `count` FROM `contact` WHERE `uid` = %d AND `rel` IN ( %d, %d ) - AND `self`=0 AND `blocked`=0", + AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0", intval($uinfo[0]['uid']), intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND) |