diff options
| author | zottel <github@zottel.net> | 2012-05-23 18:25:58 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-23 18:25:58 +0200 |
| commit | 3aa516ccabc9bb09ae30ffa2d3657fba36699ea9 (patch) | |
| tree | 93cd7fe6c2b9b0cc5851cb8324b5f6591d990f7f /mod/notes.php | |
| parent | e9c86c0fd0fb87b49e60669e6d4be810ca426ec4 (diff) | |
| parent | 61dba985c14ebcfd20d18b579aee9b781f98bc23 (diff) | |
| download | volse-hubzilla-3aa516ccabc9bb09ae30ffa2d3657fba36699ea9.tar.gz volse-hubzilla-3aa516ccabc9bb09ae30ffa2d3657fba36699ea9.tar.bz2 volse-hubzilla-3aa516ccabc9bb09ae30ffa2d3657fba36699ea9.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 ", |