diff options
| author | friendica <info@friendica.com> | 2012-05-22 21:20:31 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-05-22 21:20:31 -0700 |
| commit | 3ac7c4e8599266aba69bf521c7ba94393df3c728 (patch) | |
| tree | c4689d46b429d56024636ccad4094d70e2895e4e /mod | |
| parent | 0da20ec9ef443edd86119601e39c42f78dc1a52f (diff) | |
| download | volse-hubzilla-3ac7c4e8599266aba69bf521c7ba94393df3c728.tar.gz volse-hubzilla-3ac7c4e8599266aba69bf521c7ba94393df3c728.tar.bz2 volse-hubzilla-3ac7c4e8599266aba69bf521c7ba94393df3c728.zip | |
keep FB out of private notes
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/network.php | 6 | ||||
| -rw-r--r-- | mod/notes.php | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mod/network.php b/mod/network.php index e59839ccc..f43eeb67e 100644 --- a/mod/network.php +++ b/mod/network.php @@ -108,6 +108,10 @@ function network_content(&$a, $update = 0) { return login(false); } + $arr = array('query' => $a->query_string); + + call_hooks('network_content_init', $arr); + $o = ''; // item filter tabs @@ -157,7 +161,7 @@ function network_content(&$a, $update = 0) { $all_active = 'active'; } - + $postord_active = ''; if($all_active && x($_GET,'order') && $_GET['order'] !== 'comment') { diff --git a/mod/notes.php b/mod/notes.php index e6e2b44fb..0072ce447 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -81,7 +81,7 @@ function notes_content(&$a,$update = false) { $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`.`moderated` = 0 AND `item`.`deleted` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 $sql_extra ", intval(local_user()) @@ -96,7 +96,7 @@ function notes_content(&$a,$update = false) { $r = q("SELECT `item`.`id` AS `item_id`, `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 `item`.`moderated` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 $sql_extra ORDER BY `item`.`created` DESC LIMIT %d ,%d ", |