diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-02-10 18:10:08 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-02-10 18:10:08 +0000 |
| commit | fda228a172aa8f4ebee108fe569f2e515bba9ced (patch) | |
| tree | 6e16308aafc0034814f1214b8fe3a7a2d01d96f5 | |
| parent | fb94e1d7b8b7fe13b081262a73ea42e940c2c03f (diff) | |
| download | brdo-fda228a172aa8f4ebee108fe569f2e515bba9ced.tar.gz brdo-fda228a172aa8f4ebee108fe569f2e515bba9ced.tar.bz2 | |
Fix bad default timezone format for timezone display. Would cause a bug on sites that haven't been configured completely yet.
| -rw-r--r-- | modules/system.module | 4 | ||||
| -rw-r--r-- | modules/system/system.module | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/system.module b/modules/system.module index b9a7918bb..4b6ca99c1 100644 --- a/modules/system.module +++ b/modules/system.module @@ -90,7 +90,7 @@ function system_user($type, $edit, &$user) { $zonelist = array(-11, -10, -9.5, -9, -8, -7, -6, -5, -4, -3.5, -3, -2, -1, 0, 1, 2, 3, 3.5, 4, 5, 5.5, 5.75, 6, 6.5, 7, 8, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 14); foreach ($zonelist as $offset) { $zone = $offset * 3600; - $zones[$zone] = format_date($timestamp, 'custom', variable_get('date_format_long', $datelong[0]) . ' O', $zone); + $zones[$zone] = format_date($timestamp, 'custom', variable_get('date_format_long', 'l, F j, Y - H:i') . ' O', $zone); } $data[t('Locale settings')] = form_select(t("Time zone"), "timezone", $edit["timezone"], $zones, t("Select what time you currently have and your time zone settings will be set appropriate.")); return $data; @@ -146,7 +146,7 @@ function system_view_general() { $zonelist = array(-11, -10, -9.5, -9, -8, -7, -6, -5, -4, -3.5, -3, -2, -1, 0, 1, 2, 3, 3.5, 4, 5, 5.5, 5.75, 6, 6.5, 7, 8, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 14); foreach ($zonelist as $offset) { $zone = $offset * 3600; - $zones[$zone] = format_date($timestamp, 'custom', variable_get('date_format_long', $datelong[0]) . ' O', $zone); + $zones[$zone] = format_date($timestamp, 'custom', variable_get('date_format_long', 'l, F j, Y - H:i') . ' O', $zone); } // date settings: possible date formats diff --git a/modules/system/system.module b/modules/system/system.module index b9a7918bb..4b6ca99c1 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -90,7 +90,7 @@ function system_user($type, $edit, &$user) { $zonelist = array(-11, -10, -9.5, -9, -8, -7, -6, -5, -4, -3.5, -3, -2, -1, 0, 1, 2, 3, 3.5, 4, 5, 5.5, 5.75, 6, 6.5, 7, 8, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 14); foreach ($zonelist as $offset) { $zone = $offset * 3600; - $zones[$zone] = format_date($timestamp, 'custom', variable_get('date_format_long', $datelong[0]) . ' O', $zone); + $zones[$zone] = format_date($timestamp, 'custom', variable_get('date_format_long', 'l, F j, Y - H:i') . ' O', $zone); } $data[t('Locale settings')] = form_select(t("Time zone"), "timezone", $edit["timezone"], $zones, t("Select what time you currently have and your time zone settings will be set appropriate.")); return $data; @@ -146,7 +146,7 @@ function system_view_general() { $zonelist = array(-11, -10, -9.5, -9, -8, -7, -6, -5, -4, -3.5, -3, -2, -1, 0, 1, 2, 3, 3.5, 4, 5, 5.5, 5.75, 6, 6.5, 7, 8, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 14); foreach ($zonelist as $offset) { $zone = $offset * 3600; - $zones[$zone] = format_date($timestamp, 'custom', variable_get('date_format_long', $datelong[0]) . ' O', $zone); + $zones[$zone] = format_date($timestamp, 'custom', variable_get('date_format_long', 'l, F j, Y - H:i') . ' O', $zone); } // date settings: possible date formats |