Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index a7aebe709a29b726a504cd300a201b8832429320..f7245942a9e329c03a98f655086926884d293420 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -323,7 +323,7 @@ function delivery_run(&$argv, &$argc){
 
                                // perform local delivery if we are on the same site
 
-                               if (link_compare($basepath,$a->get_baseurl())) {
+                               if (link_compare($basepath,App::get_baseurl())) {
 
                                        $nickname = basename($contact['url']);
                                        if ($contact['issued-id'])
@@ -508,7 +508,7 @@ function delivery_run(&$argv, &$argc){
                                        break;
 
                                if ($mail) {
-                                       diaspora::send_mail($item,$owner,$contact);
+                                       Diaspora::send_mail($item,$owner,$contact);
                                        break;
                                }
 
@@ -530,22 +530,22 @@ function delivery_run(&$argv, &$argc){
                                if (($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
                                        // top-level retraction
                                        logger('diaspora retract: '.$loc);
-                                       diaspora::send_retraction($target_item,$owner,$contact,$public_message);
+                                       Diaspora::send_retraction($target_item,$owner,$contact,$public_message);
                                        break;
                                } elseif ($followup) {
                                        // send comments and likes to owner to relay
                                        logger('diaspora followup: '.$loc);
-                                       diaspora::send_followup($target_item,$owner,$contact,$public_message);
+                                       Diaspora::send_followup($target_item,$owner,$contact,$public_message);
                                        break;
                                } elseif ($target_item['uri'] !== $target_item['parent-uri']) {
                                        // we are the relay - send comments, likes and relayable_retractions to our conversants
                                        logger('diaspora relay: '.$loc);
-                                       diaspora::send_relay($target_item,$owner,$contact,$public_message);
+                                       Diaspora::send_relay($target_item,$owner,$contact,$public_message);
                                        break;
                                } elseif ($top_level && !$walltowall) {
                                        // currently no workable solution for sending walltowall
                                        logger('diaspora status: '.$loc);
-                                       diaspora::send_status($target_item,$owner,$contact,$public_message);
+                                       Diaspora::send_status($target_item,$owner,$contact,$public_message);
                                        break;
                                }