aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/admin/admin_db_utilities.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/admin/admin_db_utilities.php b/phpBB/admin/admin_db_utilities.php
index 0d89466409..753802bc69 100644
--- a/phpBB/admin/admin_db_utilities.php
+++ b/phpBB/admin/admin_db_utilities.php
@@ -896,7 +896,7 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
//
if( file_exists($backup_file_tmpname) )
{
- if( preg_match("/^(text\/[a-zA-Z]+)|(application\/(x\-)?gzip\-compressed)|(application\/octet-stream)$/is", $backup_file_type) )
+ if( preg_match("/^(text\/[a-zA-Z]+)|(application\/(x\-)?gzip(\-compressed)?)|(application\/octet-stream)$/is", $backup_file_type) )
{
if( preg_match("/\.gz$/is",$backup_file_name) )
{
@@ -937,7 +937,7 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
else
{
include('page_header_admin.'.$phpEx);
- message_die(GENERAL_ERROR, $lang['Restore_Error_filename'] );
+ message_die(GENERAL_ERROR, $lang['Restore_Error_filename'] ." $backup_file_type $backup_file_name");
}
}
else