friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

attribution issue - don't take author name from contact if available from item.

Browse source
This commit is contained in:
friendica 2012-02-24 20:03:13 -08:00
commit f5c5da742d
4 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/delivery.php
View file

@ -272,10 +272,10 @@ function delivery_run($argv, $argc){
if($normal_mode) {
if($item_id == $item['id'] || $item['id'] == $item['parent'])
$atom .= atom_entry($item,'text',$item_contact,$owner,true);
$atom .= atom_entry($item,'text',null,$owner,true);
}
else
$atom .= atom_entry($item,'text',$item_contact,$owner,true);
$atom .= atom_entry($item,'text',null,$owner,true);
}
@ -363,7 +363,7 @@ function delivery_run($argv, $argc){
continue;
if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
$slaps[] = atom_entry($item,'html',$item_contact,$owner,true);
$slaps[] = atom_entry($item,'html',null,$owner,true);
}
logger('notifier: slapdelivery: ' . $contact['name']);