aboutsummaryrefslogtreecommitdiffstats
path: root/mod/network.php
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-07-19 06:58:03 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-07-19 06:58:03 -0700
commit6695b4a203ab03941c8b3305a3e55cc02b85a5ac (patch)
tree47af4ee89d71b4c0584ae30da1883d5ae9e933a2 /mod/network.php
parentbbe53699f26bfa4e4d17da097fd8f2fc14da47dd (diff)
downloadvolse-hubzilla-6695b4a203ab03941c8b3305a3e55cc02b85a5ac.tar.gz
volse-hubzilla-6695b4a203ab03941c8b3305a3e55cc02b85a5ac.tar.bz2
volse-hubzilla-6695b4a203ab03941c8b3305a3e55cc02b85a5ac.zip
more bugs
Diffstat (limited to 'mod/network.php')
-rw-r--r--mod/network.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/network.php b/mod/network.php
index 3ccd8be48..51b528832 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -40,7 +40,7 @@ function network_content(&$a) {
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
- AND `contact`.`blocked` = 0
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra ",
intval($_SESSION['uid'])
);
@@ -54,7 +54,7 @@ function network_content(&$a) {
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
- AND `contact`.`blocked` = 0
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
ORDER BY `parent` DESC, `created` ASC LIMIT %d ,%d ",
intval($_SESSION['uid']),