Merge pull request #3168 from annando/bugfix-contact-posts

[friendica.git] / include / pubsubpublish.php

diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index abf973a284cbb160f5716364ee03670fa4f534d9..428103a9713e5616f342a509d38f4cb1c016394d 100644 (file)
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -72,20 +72,22 @@ function pubsubpublish_run(&$argv, &$argc){
 
        require_once('include/items.php');
 
-       load_config('config');
-       load_config('system');
+       Config::load();
 
        // Don't check this stuff if the function is called by the poller
-       if (App::callstack() != "poller_run")
-               if (App::is_already_running("pubsubpublish", "include/pubsubpublish.php", 540))
+       if (App::callstack() != "poller_run") {
+               if (App::is_already_running("pubsubpublish", "include/pubsubpublish.php", 540)) {
                        return;
+               }
+       }
 
        $a->set_baseurl(get_config('system','url'));
 
        load_hooks();
 
-       if($argc > 1)
+       if ($argc > 1) {
                $pubsubpublish_id = intval($argv[1]);
+       }
        else {
                // We'll push to each subscriber that has push > 0,
                // i.e. there has been an update (set in notifier.php).
@@ -95,10 +97,11 @@ function pubsubpublish_run(&$argv, &$argc){
                $interval = Config::get("system", "delivery_interval", 2);
 
                // If we are using the worker we don't need a delivery interval
-               if (get_config("system", "worker"))
+               if (get_config("system", "worker")) {
                        $interval = false;
+               }
 
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
                        logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG);
                        proc_run(PRIORITY_HIGH, 'include/pubsubpublish.php', $rr["id"]);