Merge branch 'dev' into perms
This commit is contained in:
commit
8a9f062b95
12
boot.php
12
boot.php
@ -2457,24 +2457,16 @@ function check_cron_broken() {
|
||||
set_config('system','lastcroncheck',datetime_convert());
|
||||
return;
|
||||
}
|
||||
$t = get_config('system','lastcroncheck');
|
||||
if($t === false) {
|
||||
// This is serious. Config storage isn't working.
|
||||
// We just set lastcroncheck. The system is horked.
|
||||
// However don't add insult to injury by sending an email
|
||||
// to the admin every time a page is accessed.
|
||||
// just quietly
|
||||
return;
|
||||
}
|
||||
|
||||
if($t > datetime_convert('UTC','UTC','now - 3 days')) {
|
||||
// Wait for 3 days before we do anything so as not to swamp the admin with messages
|
||||
return;
|
||||
}
|
||||
|
||||
set_config('system','lastcroncheck',datetime_convert());
|
||||
|
||||
if(($d) && ($d > datetime_convert('UTC','UTC','now - 3 days'))) {
|
||||
// Scheduled tasks have run successfully in the last 3 days.
|
||||
set_config('system','lastcroncheck',datetime_convert());
|
||||
return;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user