aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-08-22 20:57:20 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-08-22 20:57:20 -0700
commitb02e30f1cfb3e92c65a5b8783256260a2e72ecc2 (patch)
tree96d9195ed0fb9d0b12a77451dd771293fba1421b /include/items.php
parent024f2019e6a3f23bec88d3c1100d67456e34adc9 (diff)
downloadvolse-hubzilla-b02e30f1cfb3e92c65a5b8783256260a2e72ecc2.tar.gz
volse-hubzilla-b02e30f1cfb3e92c65a5b8783256260a2e72ecc2.tar.bz2
volse-hubzilla-b02e30f1cfb3e92c65a5b8783256260a2e72ecc2.zip
sort out notify x-domain
Diffstat (limited to 'include/items.php')
-rw-r--r--include/items.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index aeb89892e..f57f3a833 100644
--- a/include/items.php
+++ b/include/items.php
@@ -67,10 +67,11 @@ function get_feed_for(&$a,$dfrn_id,$owner_id,$last_update) {
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1
AND NOT `item`.`type` IN ( 'remote', 'net-comment' ) AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND `item`.`edited` > '%s'
+ AND ( `item`.`edited` > '%s' OR `item`.`changed` > '%s' )
$sql_extra
ORDER BY `parent` ASC, `created` ASC LIMIT 0, 300",
intval($owner_id),
+ dbesc($check_date),
dbesc($check_date)
);
if(! count($r))
@@ -209,6 +210,7 @@ function post_remote($a,$arr) {
$arr['owner-avatar'] = notags(trim($arr['owner-avatar']));
$arr['created'] = datetime_convert('UTC','UTC',$arr['created'],'Y-m-d H:i:s');
$arr['edited'] = datetime_convert('UTC','UTC',$arr['edited'],'Y-m-d H:i:s');
+ $arr['changed'] = datetime_convert();
$arr['title'] = notags(trim($arr['title']));
$arr['location'] = notags(trim($arr['location']));
$arr['body'] = escape_tags(trim($arr['body']));