oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 1703-worker-splitting

Browse source
This commit is contained in:
Michael Vogel 2017-03-21 17:08:07 +01:00 • committed by GitHub
commit 4ebebe96fe
181 changed files with 3486 additions and 4306 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/cron.php
View file

@ -20,7 +20,7 @@ function cron_run(&$argv, &$argc){
}
if ($last) {
$next = $last + ($poll_interval * 60);
if ($next > time()) {
if($next > time()) {
logger('cron intervall not reached');
return;
}
@ -65,7 +65,7 @@ function cron_run(&$argv, &$argc){
$d1 = get_config('system','last_expire_day');
$d2 = intval(datetime_convert('UTC','UTC','now','d'));
if ($d2 != intval($d1)) {
if($d2 != intval($d1)) {
proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_contact_birthdays");
@ -170,7 +170,7 @@ function cron_poll_contacts($argc, $argv) {
continue;
}
foreach ($res as $contact) {
foreach($res as $contact) {
$xml = false;
@ -192,7 +192,7 @@ function cron_poll_contacts($argc, $argv) {
$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
}
if ($contact['priority'] AND !$force) {
if($contact['priority'] AND !$force) {
$update = false;