Merge branch 'fix/mktime' into local_christophe

This commit is contained in:
Christophe LATOUR 2018-01-04 18:39:56 +01:00
commit a199f1bed9

View File

@ -73,14 +73,14 @@ class Sale {
}
public function isFinished($check_enabled=FALSE) {
if(($check_enabled === TRUE && $this->enabled || $check_enabled === FALSE) && strtotime($this->date_end) < mktime()) {
if(($check_enabled === TRUE && $this->enabled || $check_enabled === FALSE) && strtotime($this->date_end) < time()) {
return TRUE;
}
return FALSE;
}
public function isStarted($check_enabled=FALSE) {
if(($check_enabled === TRUE && $this->enabled || $check_enabled === FALSE) && strtotime($this->date_start) < mktime()) {
if(($check_enabled === TRUE && $this->enabled || $check_enabled === FALSE) && strtotime($this->date_start) < time()) {
return TRUE;
}
return FALSE;