Merge remote-tracking branch 'upstream/develop' into 1604-clean-contact-url

[friendica.git] / include / pubsubpublish.php

diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index b438b36e6b959f3ed8d49d8a6ac31234b7d6617f..625eefc261b69af08b4011d44265ffd1ddb61a1f 100644 (file)
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -16,7 +16,7 @@ function handle_pubsubhubbub() {
 
                logger("Generate feed for user ".$rr['nickname']." - last updated ".$rr['last_update'], LOGGER_DEBUG);
 
-               $params = ostatus_feed($a, $rr['nickname'], $rr['last_update']);
+               $params = ostatus::feed($a, $rr['nickname'], $rr['last_update']);
                $hmac_sig = hash_hmac("sha1", $params, $rr['secret']);
 
                $headers = array("Content-type: application/atom+xml",
@@ -80,7 +80,7 @@ function pubsubpublish_run(&$argv, &$argc){
 
        // Don't check this stuff if the function is called by the poller
        if (App::callstack() != "poller_run")
-               if (App::is_already_running("include/pubsubpublish.php", 'pubsubpublish', 540))
+               if (App::is_already_running("pubsubpublish", "include/pubsubpublish.php", 540))
                        return;
 
        $a->set_baseurl(get_config('system','url'));