Merge remote branch 'upstream/master'

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index 97a76965a7b6c187e6a4d6753728275be5bc00b6..c1ff07bd5438226b6b63a18e7327172e8329dff6 100755 (executable)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -273,10 +273,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);
 
                        }
 
@@ -364,7 +364,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']);