diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-02-06 21:27:24 +0100 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-02-06 21:27:24 +0100 |
| commit | 97b608db38edac6e4989c7343e9de8f32f46f263 (patch) | |
| tree | b303d7bf32e58abcd22efcc6fe0d9171284a3337 /include | |
| parent | 64be33a3ff9ddae16ba7a57c842441a2d0058a5b (diff) | |
| parent | ac3f3a6e9fb46ab608f26d4dfc12ee631e0e453a (diff) | |
| download | volse-hubzilla-97b608db38edac6e4989c7343e9de8f32f46f263.tar.gz volse-hubzilla-97b608db38edac6e4989c7343e9de8f32f46f263.tar.bz2 volse-hubzilla-97b608db38edac6e4989c7343e9de8f32f46f263.zip | |
Merge branch 'friendika-master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/items.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php index 359378ff7..15fd262f4 100644 --- a/include/items.php +++ b/include/items.php @@ -144,7 +144,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`id` AS `contact-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 + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`parent` != 0 AND `item`.`wall` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND ( `item`.`edited` > '%s' OR `item`.`changed` > '%s' ) $sql_extra |