Skip to content
Browse files

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.
  • Loading branch information...
2 parents d03366f + 810016c commit fb430299356a027686a3216ba4974b955f3701ae @p p committed Nov 19, 2011
Showing with 7 additions and 3 deletions.
  1. +6 −3 phpBB/includes/acp/acp_database.php
  2. +1 −0 phpBB/language/en/acp/database.php
View
9 phpBB/includes/acp/acp_database.php
@@ -221,6 +221,7 @@ function main($id, $mode)
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 @@ function main($id, $mode)
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 @@ function main($id, $mode)
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');
View
1 phpBB/language/en/acp/database.php
@@ -59,6 +59,7 @@
'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',

0 comments on commit fb43029

Please sign in to comment.
Something went wrong with that request. Please try again.