diff options
| author | friendica <info@friendica.com> | 2012-05-29 01:14:53 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-05-29 01:14:53 -0700 |
| commit | 2eafa9a47519f9f35c5eb568cf4235c092c1dcce (patch) | |
| tree | b0b1656b9b7c46f003e6910933d0f86b7a1fb6e3 /mod/notes.php | |
| parent | 0241bd1fbf28e15daeb939bc14976cd2fd6d3251 (diff) | |
| download | volse-hubzilla-2eafa9a47519f9f35c5eb568cf4235c092c1dcce.tar.gz volse-hubzilla-2eafa9a47519f9f35c5eb568cf4235c092c1dcce.tar.bz2 volse-hubzilla-2eafa9a47519f9f35c5eb568cf4235c092c1dcce.zip | |
ability to only expire contacts, not self
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 |