item cleanup
This commit is contained in:
parent
49c9860e61
commit
3a3bf273c7
|
@ -34,8 +34,10 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update) {
|
||||||
|
|
||||||
if($dfrn_id != '*') {
|
if($dfrn_id != '*') {
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `issued-id` = '%s' LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE ( `issued-id` = '%s' OR ( `duplex` = 1 AND `dfrn-id` = '%s' )) AND `uid` = %d LIMIT 1",
|
||||||
dbesc($dfrn_id)
|
dbesc($dfrn_id),
|
||||||
|
dbesc($dfrn_id),
|
||||||
|
intval($owner_id)
|
||||||
);
|
);
|
||||||
if(! count($r))
|
if(! count($r))
|
||||||
return false;
|
return false;
|
||||||
|
@ -162,7 +164,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update) {
|
||||||
'$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
|
'$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
|
||||||
'$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)),
|
'$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)),
|
||||||
'$type' => $type,
|
'$type' => $type,
|
||||||
'$content' =>xmlify($item['body']),
|
'$content' => xmlify($item['body']),
|
||||||
'$verb' => xmlify($verb),
|
'$verb' => xmlify($verb),
|
||||||
'$actobj' => $actobj, // do not xmlify
|
'$actobj' => $actobj, // do not xmlify
|
||||||
'$parent_id' => xmlify($item['parent-uri']),
|
'$parent_id' => xmlify($item['parent-uri']),
|
||||||
|
|
Loading…
Reference in a new issue