diff options
| author | roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2005-09-28 22:28:05 +0000 |
|---|---|---|
| committer | roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2005-09-28 22:28:05 +0000 |
| commit | 63421e8191dd25c04b74ebcecdcd4231625a9ea9 (patch) | |
| tree | 3d9f5045687d3f40fbdea8ccaf13d1c2e00bc2b7 /roundcubemail/program/include/main.inc | |
| parent | a54c76a1fc8917231c034ffc1938fe54b77b7c3d (diff) | |
Minor bugfixes and correction of confusing License notfications
git-svn-id: https://svn.roundcube.net/trunk@8 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/main.inc')
| -rw-r--r-- | roundcubemail/program/include/main.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index 8cbc271b1..83421768a 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/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'; |