use fancybox instead of lightbox

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index 98c4f75df25e540925ef835443b42a5a6eaf0123..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']);
@@ -438,14 +438,14 @@ function delivery_run($argv, $argc){
                                $file = tempnam("/tmp/friendica/", "mail-out-");
                                file_put_contents($file, json_encode($it));
 
-                               $headers .= 'Message-Id: <' . email_cleanupmessageid($it['uri']). '>' . "\n";
+                               $headers .= 'Message-Id: <' . iri2msgid($it['uri']). '>' . "\n";
 
                                //logger("Mail: uri: ".$it['uri']." parent-uri ".$it['parent-uri'], LOGGER_DEBUG);
                                //logger("Mail: Data: ".print_r($it, true), LOGGER_DEBUG);
                                //logger("Mail: Data: ".print_r($it, true), LOGGER_DATA);
 
                                if($it['uri'] !== $it['parent-uri']) {
-                                       $headers .= 'References: <' . email_cleanupmessageid($it['parent-uri']) . '>' . "\n";
+                                       $headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
                                        if(! strlen($it['title'])) {
                                                $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
                                                        dbesc($it['parent-uri'])