diff options
| author | thomascube <thomas@roundcube.net> | 2005-09-28 22:28:05 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2005-09-28 22:28:05 +0000 |
| commit | 30233b8dfb7fe5070dfa11b3e6d2015fb50aa769 (patch) | |
| tree | 46cf5db699d97802e7c408c00a62e72dc22c640f /program/include/main.inc | |
| parent | 20a1b3a0e1a46266b149a23562bb71680e666edb (diff) | |
Minor bugfixes and correction of confusing License notfications
Diffstat (limited to 'program/include/main.inc')
| -rw-r--r-- | program/include/main.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index 8cbc271b1..83421768a 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -6,7 +6,7 @@ | | | This file is part of the RoundCube Webmail client | | Copyright (C) 2005, RoundCube Dev, - Switzerland | - | All rights reserved. | + | Licensed under the GNU GPL | | | | PURPOSE: | | Provide basic functions for the webmail package | @@ -887,10 +887,10 @@ function format_date($date, $format=NULL) $week_secs = 60 * 60 * 24 * 7; $diff = $now - $timestamp; - // define daate format depending on current time - if (!$format && $diff < $day_secs) + // define date format depending on current time + if ($CONFIG['prettydate'] && !$format && $diff < $day_secs) return sprintf('%s %s', rcube_label('today'), date('H:i', $timestamp)); - else if (!$format && $diff < $week_secs) + else if ($CONFIG['prettydate'] && !$format && $diff < $week_secs) $format = $CONFIG['date_short'] ? $CONFIG['date_short'] : 'D H:i'; else if (!$format) $format = $CONFIG['date_long'] ? $CONFIG['date_long'] : 'd.m.Y H:i'; |