diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-05-25 16:19:10 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-05-25 16:19:10 +0200 |
| commit | a71e3134bf7250b60cafd1e51098eea70c3459de (patch) | |
| tree | 456f59d30e5f4b8d22f4bfdac0c55e7323cd0427 /mod/notes.php | |
| parent | 8c80fe0bf51fa472ddf9bf225490e47ea1bf4a7f (diff) | |
| parent | d1345e505406b1a1cdc3fc26a1734916c8abc89d (diff) | |
| download | volse-hubzilla-a71e3134bf7250b60cafd1e51098eea70c3459de.tar.gz volse-hubzilla-a71e3134bf7250b60cafd1e51098eea70c3459de.tar.bz2 volse-hubzilla-a71e3134bf7250b60cafd1e51098eea70c3459de.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/notes.php')
| -rw-r--r-- | mod/notes.php | 4 |
1 files changed, 2 insertions, 2 deletions
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 ", |