diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-05-26 15:42:23 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-05-26 15:42:23 +0200 |
| commit | a08232fa955385b2eaff5f9094b39071fb1632ae (patch) | |
| tree | b18ccde349d9f2a0dc06e32bdae0007b5953d4f9 /mod/notes.php | |
| parent | 7f19d39b146844fd71d148690d3e550df9d3043b (diff) | |
| parent | 817fc37f41c030381507384db581f62d9a1b5044 (diff) | |
| download | volse-hubzilla-a08232fa955385b2eaff5f9094b39071fb1632ae.tar.gz volse-hubzilla-a08232fa955385b2eaff5f9094b39071fb1632ae.tar.bz2 volse-hubzilla-a08232fa955385b2eaff5f9094b39071fb1632ae.zip | |
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'mod/notes.php')
| -rw-r--r-- | mod/notes.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/notes.php b/mod/notes.php index 0072ce447..64cc17a65 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -80,7 +80,8 @@ 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 + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 + AND `item`.`deleted` = 0 AND `item`.`origin` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 $sql_extra ", @@ -95,7 +96,8 @@ 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 + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + and `item`.`moderated` = 0 AND `item`.`origin` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 $sql_extra |