diff options
| author | Michael <icarus@dabo.de> | 2012-05-26 11:59:19 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-05-26 11:59:19 +0200 |
| commit | 7b3c02057db47a627b56bdd79f1055ea7f876617 (patch) | |
| tree | 8c9b11fa72e544aea721f385b40bff7254e42ed2 /mod/notes.php | |
| parent | 6342b3e0bdd5774857a8fca809994f05e0208d25 (diff) | |
| parent | f5290a5a107ef2d6c309c4a3205319c9b0d13994 (diff) | |
| download | volse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.tar.gz volse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.tar.bz2 volse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/notes.php')
| -rw-r--r-- | mod/notes.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mod/notes.php b/mod/notes.php index e6e2b44fb..64cc17a65 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -80,8 +80,9 @@ 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 + 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 ", intval(local_user()) @@ -95,8 +96,9 @@ 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 + 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 ORDER BY `item`.`created` DESC LIMIT %d ,%d ", |