diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-19 21:52:43 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-19 21:52:43 -0500 |
| commit | fb430299356a027686a3216ba4974b955f3701ae (patch) | |
| tree | ff25083359667eebcc5e1b1b3a101bdec5c7ed1c /phpBB | |
| parent | d03366fba2e03964cc7e62b23956641916baf74f (diff) | |
| parent | 810016ce944a0fbec70187c9d87c9124ecdccb3a (diff) | |
| download | forums-fb430299356a027686a3216ba4974b955f3701ae.tar forums-fb430299356a027686a3216ba4974b955f3701ae.tar.gz forums-fb430299356a027686a3216ba4974b955f3701ae.tar.bz2 forums-fb430299356a027686a3216ba4974b955f3701ae.tar.xz forums-fb430299356a027686a3216ba4974b955f3701ae.zip | |
Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympus
* cs278/ticket/10239:
[ticket/10239] Correct undefined variable error.
[ticket/10239] Add confirm box to backup restore.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 9 | ||||
| -rw-r--r-- | phpBB/language/en/acp/database.php | 1 |
2 files changed, 7 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'); diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php index ae8f76d6b7..9c8ecbf13a 100644 --- a/phpBB/language/en/acp/database.php +++ b/phpBB/language/en/acp/database.php @@ -59,6 +59,7 @@ $lang = array_merge($lang, array( 'RESTORE_FAILURE' => 'The backup file may be corrupt.', 'RESTORE_OPTIONS' => 'Restore options', + 'RESTORE_SELECTED_BACKUP' => 'Are you sure you want to restore the selected backup?', 'RESTORE_SUCCESS' => 'The database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made.', 'SELECT_ALL' => 'Select all', |