diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-05-29 16:09:26 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-05-29 16:09:26 +0200 |
| commit | 68757f25042b02624bfb748c25029023b3082f62 (patch) | |
| tree | 676489a112b4d972e1e5626a6dadfd604fc9ce7a /mod/notes.php | |
| parent | a08232fa955385b2eaff5f9094b39071fb1632ae (diff) | |
| parent | 2eafa9a47519f9f35c5eb568cf4235c092c1dcce (diff) | |
| download | volse-hubzilla-68757f25042b02624bfb748c25029023b3082f62.tar.gz volse-hubzilla-68757f25042b02624bfb748c25029023b3082f62.tar.bz2 volse-hubzilla-68757f25042b02624bfb748c25029023b3082f62.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 64cc17a65..703c898e6 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 `item`.`origin` = 1 + AND `item`.`deleted` = 0 AND `item`.`type` = 'note' AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 $sql_extra ", @@ -97,7 +97,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 `item`.`origin` = 1 + and `item`.`moderated` = 0 AND `item`.`type` = 'note' AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 $sql_extra |