From d96dfdbc89cbe273b243acba030e8d09355d7796 Mon Sep 17 00:00:00 2001 From: yysa Date: Mon, 10 Nov 2014 19:05:13 +0100 Subject: [PATCH] Fix calculation of the relative deadline date (today, yesterday, tomorrow), using client time zone --- app/model/task.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/model/task.php b/app/model/task.php index f45306f..ebd4f97 100644 --- a/app/model/task.php +++ b/app/model/task.php @@ -273,10 +273,10 @@ class TaskSummary extends TaskModel { if ($this->isEmpty('deadline')) { $this->_diff = 9999; } else { - $dead = strtotime($this->get('deadline')); + $dead = date_timestamp_get(new DateTime($this->get('deadline'), $GLOBALS['config']['datetime']['timezone_user'])); // -TODO- optimize ! maybe using DateTime diff ? - $usernow = date_timestamp_get(new DateTime('now', $GLOBALS['config']['datetime']['timezone_user'])); - $this->_diff = round(($dead - $usernow) / 3600 / 24); + $usernow = date_timestamp_get(new DateTime('now')); + $this->_diff = ceil(($dead - $usernow) / 3600 / 24); } } @@ -423,4 +423,4 @@ class TaskSummary extends TaskModel { return parent::loadList(false); } -} \ No newline at end of file +}