Merge pull request #2336 from stieben/move-div-pause

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index d046005994a69def796acad67b1d9c953c538c0e..021ceb9968a8496e738685021af242f60102aaa4 100644 (file)
--- 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);