diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-01-02 18:53:55 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-01-02 18:53:55 +0100 |
| commit | 2345be38b682a58f9b5e5429c76db97a0564093d (patch) | |
| tree | fe39c5f348f86c23f3c9af9011d6d0c1b0c0baf5 /phpBB/includes/acp/acp_database.php | |
| parent | c8da5ad9f42d8ced1aead79a42cc5caee5c5a2ff (diff) | |
| parent | e14c3f3b77ab07ce97f357a15db5db5101df06c1 (diff) | |
| download | forums-2345be38b682a58f9b5e5429c76db97a0564093d.tar forums-2345be38b682a58f9b5e5429c76db97a0564093d.tar.gz forums-2345be38b682a58f9b5e5429c76db97a0564093d.tar.bz2 forums-2345be38b682a58f9b5e5429c76db97a0564093d.tar.xz forums-2345be38b682a58f9b5e5429c76db97a0564093d.zip | |
Merge branch 'prep-release-3.0.10'
* prep-release-3.0.10: (221 commits)
[prep-release-3.0.10] Bumping version number for 3.0.10 final.
[prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.
[ticket/10531] Disallow deleting of the last style
[ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
[ticket/8996] Revert initial fix to keep old behaviour on empty selection
[ticket/10319] Missing hidden fields in search form
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
[prep-release-3.0.10] Bumping version number for 3.0.10-RC3.
[ticket/10480] Add a build target for changelog building.
[ticket/10480] Add a build script for exporting the changelog from tracker.
[ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
[prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
[ticket/10501] Fix description of table prefixes
[ticket/10503] Debug error "Invalid arguments" when previewing edits
[prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
[ticket/10497] Fix SQL error when guest visits forum with unread topic
[prep-release-3.0.10] Bumping version number for 3.0.10-RC2.
[ticket/10461] Add a comment explaining the logic here.
...
Diffstat (limited to 'phpBB/includes/acp/acp_database.php')
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 193dd001c0..62bcd43a47 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -221,6 +221,7 @@ class acp_database case 'submit': $delete = request_var('delete', ''); $file = request_var('file', ''); + $download = request_var('download', ''); if (!preg_match('#^backup_\d{10,}_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches)) { @@ -247,10 +248,8 @@ class acp_database confirm_box(false, $user->lang['DELETE_SELECTED_BACKUP'], build_hidden_fields(array('delete' => $delete, 'file' => $file))); } } - else + else if ($download || confirm_box(true)) { - $download = request_var('download', ''); - if ($download) { $name = $matches[0]; @@ -411,6 +410,10 @@ class acp_database trigger_error($user->lang['RESTORE_SUCCESS'] . adm_back_link($this->u_action)); break; } + else if (!$download) + { + confirm_box(false, $user->lang['RESTORE_SELECTED_BACKUP'], build_hidden_fields(array('file' => $file))); + } default: $methods = array('sql'); |