diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-24 17:19:01 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-24 17:19:01 +0000 |
| commit | 9f9322511d8ab88beb8f1bf3e5e8b4495a7179ce (patch) | |
| tree | 5cb3042a436c241c5d6cd3eaab6d5f4359925599 /phpBB/includes/acp | |
| parent | 7730930373e62d5cfb9326025b9955cd6dd00a7e (diff) | |
| download | forums-9f9322511d8ab88beb8f1bf3e5e8b4495a7179ce.tar forums-9f9322511d8ab88beb8f1bf3e5e8b4495a7179ce.tar.gz forums-9f9322511d8ab88beb8f1bf3e5e8b4495a7179ce.tar.bz2 forums-9f9322511d8ab88beb8f1bf3e5e8b4495a7179ce.tar.xz forums-9f9322511d8ab88beb8f1bf3e5e8b4495a7179ce.zip | |
do not substract one year, only show the full date to not confuse users.
git-svn-id: file:///svn/phpbb/trunk@7396 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index d3a6e9da6f..7565161b69 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -767,7 +767,7 @@ class acp_board foreach ($user->lang['dateformats'] as $format => $null) { $dateformat_options .= '<option value="' . $format . '"' . (($format == $value) ? ' selected="selected"' : '') . '>'; - $dateformat_options .= $user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? $user->lang['VARIANT_DATE_SEPARATOR'] . $user->format_date(time() - 31536000, $format, true) : ''); + $dateformat_options .= $user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? $user->lang['VARIANT_DATE_SEPARATOR'] . $user->format_date(time(), $format, false) : ''); $dateformat_options .= '</option>'; } diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index d3dd8ee7c3..18aa88c93a 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1235,7 +1235,7 @@ class acp_users foreach ($user->lang['dateformats'] as $format => $null) { $dateformat_options .= '<option value="' . $format . '"' . (($format == $data['dateformat']) ? ' selected="selected"' : '') . '>'; - $dateformat_options .= $user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? $user->lang['VARIANT_DATE_SEPARATOR'] . $user->format_date(time() - 31536000, $format, true) : ''); + $dateformat_options .= $user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? $user->lang['VARIANT_DATE_SEPARATOR'] . $user->format_date(time(), $format, false) : ''); $dateformat_options .= '</option>'; } |