diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-02-06 21:19:40 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-02-06 21:19:40 +0000 |
| commit | aec50a43281ecb65698f373329e6af6e91570a53 (patch) | |
| tree | 108a3fcd789011beb6f4a76b526ad267df63bfa2 /phpBB | |
| parent | 52c13bc7416111c764550e47fd86159d8f3f937b (diff) | |
| download | forums-aec50a43281ecb65698f373329e6af6e91570a53.tar forums-aec50a43281ecb65698f373329e6af6e91570a53.tar.gz forums-aec50a43281ecb65698f373329e6af6e91570a53.tar.bz2 forums-aec50a43281ecb65698f373329e6af6e91570a53.tar.xz forums-aec50a43281ecb65698f373329e6af6e91570a53.zip | |
Fix Bug #57385
Correctly sort database backup file list by date on database restore page.
Take admin's time zone settings into account when listing database backup files.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10478 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6b7edf6465..8bd8934eb0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -91,7 +91,8 @@ <a name="v307"></a><h3>1.i. Changes since 3.0.7</h3> <ul> - <li></li> + <li>[Fix] Correctly sort database backup file list by date on database restore page. (Bug #57385)</li> + <li>[Fix] Take admin's time zone settings into account when listing database backup files. (Bug #57385)</li> </ul> <a name="v306"></a><h3>1.ii. Changes since 3.0.6</h3> diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 5d7450bdfd..7b734da2af 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -435,7 +435,7 @@ class acp_database { if (in_array($matches[2], $methods)) { - $backup_files[gmdate("d-m-Y H:i:s", $matches[1])] = $file; + $backup_files[(int) $matches[1]] = $file; } } } @@ -450,7 +450,7 @@ class acp_database { $template->assign_block_vars('files', array( 'FILE' => $file, - 'NAME' => $name, + 'NAME' => $user->format_date($name, 'd-m-Y H:i:s', true), 'SUPPORTED' => true, )); } |