X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdelivery.php;h=021ceb9968a8496e738685021af242f60102aaa4;hb=c5f2157eb2914de06ae098907b1dfb68fc4d03e3;hp=d046005994a69def796acad67b1d9c953c538c0e;hpb=74ed37aa87417c6fa1bd0e04ab9981dc802916f7;p=friendica.git

diff --git a/include/delivery.php b/include/delivery.php
index d046005994..021ceb9968 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -279,12 +279,12 @@ function delivery_run(&$argv, &$argc){
 
 				if ($mail) {
 					$item['body'] = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
-					$atom = dfrn_mail($item, $owner);
+					$atom = dfrn::mail($item, $owner);
 				} elseif ($fsuggest) {
-					$atom = dfrn_fsuggest($item, $owner);
+					$atom = dfrn::fsuggest($item, $owner);
 					q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", intval($item['id']));
 				} elseif ($relocate)
-					$atom = dfrn_relocate($owner, $uid);
+					$atom = dfrn::relocate($owner, $uid);
 				elseif($followup) {
 					$msgitems = array();
 					foreach($items as $item) {  // there is only one item
@@ -295,7 +295,7 @@ function delivery_run(&$argv, &$argc){
 							$msgitems[] = $item;
 						}
 					}
-					$atom = dfrn_entries($msgitems,$owner);
+					$atom = dfrn::entries($msgitems,$owner);
 				} else {
 					$msgitems = array();
 					foreach($items as $item) {
@@ -321,7 +321,7 @@ function delivery_run(&$argv, &$argc){
 							$msgitems[] = $item;
 						}
 					}
-					$atom = dfrn_entries($msgitems,$owner);
+					$atom = dfrn::entries($msgitems,$owner);
 				}
 
 				logger('notifier entry: '.$contact["url"].' '.$target_item["guid"].' entry: '.$atom, LOGGER_DEBUG);
@@ -374,13 +374,13 @@ function delivery_run(&$argv, &$argc){
 							break;
 
 						logger('mod-delivery: local delivery');
-						local_delivery($x[0],$atom);
+						dfrn::import($atom, $x[0]);
 						break;
 					}
 				}
 
 				if(! was_recently_delayed($contact['id']))
-					$deliver_status = dfrn_deliver($owner,$contact,$atom);
+					$deliver_status = dfrn::deliver($owner,$contact,$atom);
 				else
 					$deliver_status = (-1);