Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard · Marius Burkard · commit f3b79e7d8db3 · 2017-10-18T10:33:01.000+02:00
fixed a problem where cronjobs like awstats don't get executed

See merge request ispconfig/ispconfig3!663
diff --git a/server/lib/classes/cronjob.inc.php b/server/lib/classes/cronjob.inc.php
@@ -114,7 +114,7 @@ protected function onPrepare() {
 				$next_run = $app->cron->getNextRun(ISPConfigDateTime::dbtime());
 				$this->_next_run = $next_run;
 
-				$app->db->query("REPLACE INTO `sys_cron` (`name`, `last_run`, `next_run`, `running`) VALUES (?, ?, ?, ?)", get_class($this), ($this->_last_run ? $this->_last_run : "#NULL#"), ($next_run === false ? "#NULL#" : $next_run . "'"), ($this->_running == true ? "1" : "0"));
+				$app->db->query("REPLACE INTO `sys_cron` (`name`, `last_run`, `next_run`, `running`) VALUES (?, ?, ?, ?)", get_class($this), ($this->_last_run ? $this->_last_run : "#NULL#"), ($next_run === false ? "#NULL#" : $next_run), ($this->_running == true ? "1" : "0"));
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ protected function onPrepare() {`
`114`	`114`	`$next_run = $app->cron->getNextRun(ISPConfigDateTime::dbtime());`
`115`	`115`	`$this->_next_run = $next_run;`
`116`	`116`
`117`		- $app->db->query("REPLACE INTO `sys_cron` (`name`, `last_run`, `next_run`, `running`) VALUES (?, ?, ?, ?)", get_class($this), ($this->_last_run ? $this->_last_run : "#NULL#"), ($next_run === false ? "#NULL#" : $next_run . "'"), ($this->_running == true ? "1" : "0"));
	`117`	+ $app->db->query("REPLACE INTO `sys_cron` (`name`, `last_run`, `next_run`, `running`) VALUES (?, ?, ?, ?)", get_class($this), ($this->_last_run ? $this->_last_run : "#NULL#"), ($next_run === false ? "#NULL#" : $next_run), ($this->_running == true ? "1" : "0"));
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`}`