diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-02-17 07:29:32 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-02-17 07:29:32 +0000 |
| commit | 69c3ba918e5e46befd064359e8c8a1a79bf3d927 (patch) | |
| tree | 5f085dd037d7a79aeed13b8b946893fc49968108 | |
| parent | 3412a347c2f2e5d607479c7b9c235d017cc289c3 (diff) | |
- Fix date_today, broken in r5707
git-svn-id: https://svn.roundcube.net/trunk@5891 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/include/main.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index 35c2df4c7..1e84e2dfb 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/program/include/main.inc @@ -790,6 +790,7 @@ function format_date($date, $format=NULL, $convert=true) // define date format depending on current time if (!$format) { + $now = time(); $now_date = getdate($now); $today_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday'], $now_date['year']); $week_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday']-6, $now_date['year']); |