diff options
| author | the_systech <the_systech@users.sourceforge.net> | 2002-01-24 15:31:18 +0000 |
|---|---|---|
| committer | the_systech <the_systech@users.sourceforge.net> | 2002-01-24 15:31:18 +0000 |
| commit | ddb00d817340cc5f62b05bcb9eab2b55d51adfb0 (patch) | |
| tree | 47255522d2093ed239f0523ba40e7e163ca2d1d1 | |
| parent | 46fe80562af85a46dc98cccbb9588cf589bb368c (diff) | |
| download | forums-ddb00d817340cc5f62b05bcb9eab2b55d51adfb0.tar forums-ddb00d817340cc5f62b05bcb9eab2b55d51adfb0.tar.gz forums-ddb00d817340cc5f62b05bcb9eab2b55d51adfb0.tar.bz2 forums-ddb00d817340cc5f62b05bcb9eab2b55d51adfb0.tar.xz forums-ddb00d817340cc5f62b05bcb9eab2b55d51adfb0.zip | |
Fixed a bug in filetype detection for gzip in latest mozilla...
git-svn-id: file:///svn/phpbb/trunk@1935 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/admin/admin_db_utilities.php | 4 |
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 |