Skip to content

Commit 63b9660

Browse files
author
Till Brehm
committed
Fixes #5369 Internal ISPConfig cronjobs are not run in 3.1-dev version
1 parent 7eb3be8 commit 63b9660

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

install/sql/incremental/upd_dev_collection.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ ALTER TABLE `ftp_user` CHANGE COLUMN `password` `password` VARCHAR(200) DEFAULT
3535
ALTER TABLE `shell_user` CHANGE COLUMN `password` `password` VARCHAR(200) DEFAULT NULL;
3636
ALTER TABLE `sys_user` CHANGE COLUMN `passwort` `passwort` VARCHAR(200) DEFAULT NULL;
3737
ALTER TABLE `webdav_user` CHANGE COLUMN `password` `password` VARCHAR(200) DEFAULT NULL;
38+
39+
DELETE FROM sys_cron WHERE `next_run` IS NOT NULL AND `next_run` >= DATE_ADD(`last_run`, INTERVAL 30 DAY) AND `next_run` BETWEEN '2020-01-01' AND '2020-01-02';

server/lib/classes/cron.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ private function _getNextValue($sField, $iValue, $bIncludeCurrent = false) {
265265

266266
reset($this->_aValidValues[$sField]);
267267
foreach($this->_aValidValues[$sField] as $cur) {
268-
if($bIncludeCurrent == true && $cur['value'] >= $iValue) return $cur['value'];
269-
elseif($cur['value'] > $iValue) return $cur['value'];
268+
if($bIncludeCurrent == true && $cur >= $iValue) return $cur;
269+
elseif($cur > $iValue) return $cur;
270270
}
271271
return reset($this->_aValidValues[$sField]);
272272
}

0 commit comments

Comments
 (0)