From: Michael Vogel <icarus@dabo.de>
Date: Tue, 21 Mar 2017 16:08:07 +0000 (+0100)
Subject: Merge branch 'develop' into 1703-worker-splitting
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4ebebe96fee1ea3dda219fa7049e6d14a142aa19;p=friendica.git

Merge branch 'develop' into 1703-worker-splitting
---

4ebebe96fee1ea3dda219fa7049e6d14a142aa19
diff --cc include/cron.php
index 21ce9e7c65,ca9b5dff25..3fddcc3b6b
--- a/include/cron.php
+++ b/include/cron.php
@@@ -15,12 -19,12 +15,12 @@@ function cron_run(&$argv, &$argc)
  	$last = get_config('system','last_cron');
  
  	$poll_interval = intval(get_config('system','cron_interval'));
 -	if(! $poll_interval)
 +	if (! $poll_interval) {
  		$poll_interval = 10;
 -
 -	if($last) {
 +	}
 +	if ($last) {
  		$next = $last + ($poll_interval * 60);
- 		if ($next > time()) {
+ 		if($next > time()) {
  			logger('cron intervall not reached');
  			return;
  		}
@@@ -65,9 -64,9 +65,9 @@@
  	$d1 = get_config('system','last_expire_day');
  	$d2 = intval(datetime_convert('UTC','UTC','now','d'));
  
- 	if ($d2 != intval($d1)) {
+ 	if($d2 != intval($d1)) {
  
 -		update_contact_birthdays();
 +		proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_contact_birthdays");
  
  		proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server");