diff options
| author | Michael <icarus@dabo.de> | 2012-02-26 21:47:47 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-26 21:47:47 +0100 |
| commit | 437e18d7a7433ea5a9e3388c39ba32c7fe25eb18 (patch) | |
| tree | 747449ae089f3dd3f6bb55afdf93fa79081bd564 /include/notifier.php | |
| parent | edc44933a4f57c09ee1cfb93615d052a2b125d99 (diff) | |
| parent | 2081e6d507d5983f802c1024cf1e38c6d06d6067 (diff) | |
| download | volse-hubzilla-437e18d7a7433ea5a9e3388c39ba32c7fe25eb18.tar.gz volse-hubzilla-437e18d7a7433ea5a9e3388c39ba32c7fe25eb18.tar.bz2 volse-hubzilla-437e18d7a7433ea5a9e3388c39ba32c7fe25eb18.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/notifier.php')
| -rwxr-xr-x | include/notifier.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/notifier.php b/include/notifier.php index 684395da6..4765cca06 100755 --- a/include/notifier.php +++ b/include/notifier.php @@ -383,8 +383,8 @@ function notifier_run($argv, $argc){ continue; if($item['id'] == $item_id) { logger('notifier: followup: item: ' . print_r($item,true), LOGGER_DATA); - $slap = atom_entry($item,'html',$owner,$owner,false); - $atom .= atom_entry($item,'text',$owner,$owner,false); + $slap = atom_entry($item,'html',null,$owner,false); + $atom .= atom_entry($item,'text',null,$owner,false); } } } @@ -411,13 +411,13 @@ function notifier_run($argv, $argc){ // older sites without a corresponding dfrn_notify change may do the wrong thing. if($item_id == $item['id'] || $item['id'] == $item['parent']) - $atom .= atom_entry($item,'text',$contact,$owner,true); + $atom .= atom_entry($item,'text',null,$owner,true); } else - $atom .= atom_entry($item,'text',$contact,$owner,true); + $atom .= atom_entry($item,'text',null,$owner,true); if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) - $slaps[] = atom_entry($item,'html',$contact,$owner,true); + $slaps[] = atom_entry($item,'html',null,$owner,true); } } } |