From: Michael Vogel Date: Tue, 8 Mar 2016 21:28:49 +0000 (+0100) Subject: Changed parameter order X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=65d6d45f8cdb2e1f84fc0c345043598a221312de;p=friendica.git Changed parameter order --- diff --git a/boot.php b/boot.php index fe4e5a2757..4d57d21e62 100644 --- a/boot.php +++ b/boot.php @@ -1114,7 +1114,7 @@ class App { return false; } - function is_already_running($task, $taskname, $timeout = 540) { + function is_already_running($taskname, $task = "", $timeout = 540) { $lockpath = get_lockpath(); if ($lockpath != '') { diff --git a/include/cron.php b/include/cron.php index 1c3297c932..d68bd7f084 100644 --- a/include/cron.php +++ b/include/cron.php @@ -43,7 +43,7 @@ function cron_run(&$argv, &$argc){ if (App::callstack() != "poller_run") { if (App::maxload_reached()) return; - if (App::is_already_running('include/cron.php', 'cron', 540)) + if (App::is_already_running('cron', 'include/cron.php', 540)) return; } diff --git a/include/cronhooks.php b/include/cronhooks.php index 22812fb864..b6cf0e7237 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -27,7 +27,7 @@ function cronhooks_run(&$argv, &$argc){ if (App::callstack() != "poller_run") { if (App::maxload_reached()) return; - if (App::is_already_running('include/cronhooks.php', 'cronhooks', 1140)) + if (App::is_already_running('cronhooks', 'include/cronhooks.php', 1140)) return; } diff --git a/include/discover_poco.php b/include/discover_poco.php index 8ba2bb2365..0b468faea1 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -44,7 +44,7 @@ function discover_poco_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/discover_poco.php', 'discover_poco'.$mode.urlencode($search), 1140)) + if (App::is_already_running('discover_poco'.$mode.urlencode($search), 'include/discover_poco.php', 1140)) return; $a->set_baseurl(get_config('system','url')); diff --git a/include/onepoll.php b/include/onepoll.php index 4d270f6135..eb1045de14 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -61,7 +61,7 @@ function onepoll_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('', 'onepoll'.$contact_id, 540)) + if (App::is_already_running('onepoll'.$contact_id, '', 540)) return; $d = datetime_convert(); diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php index b438b36e6b..4fbb505146 100644 --- a/include/pubsubpublish.php +++ b/include/pubsubpublish.php @@ -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')); diff --git a/include/queue.php b/include/queue.php index 1222199c70..183ce0f9cd 100644 --- a/include/queue.php +++ b/include/queue.php @@ -29,7 +29,7 @@ function queue_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/queue.php', 'queue', 540)) + if (App::is_already_running('queue', 'include/queue.php', 540)) return; $a->set_baseurl(get_config('system','url')); diff --git a/include/update_gcontact.php b/include/update_gcontact.php index 25c11806a2..88e1817f0b 100644 --- a/include/update_gcontact.php +++ b/include/update_gcontact.php @@ -38,7 +38,7 @@ function update_gcontact_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('', 'update_gcontact'.$contact_id, 540)) + if (App::is_already_running('update_gcontact'.$contact_id, '', 540)) return; $r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));