mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-02 13:47:55 +02:00
Fixed a bug in filetype detection for gzip in latest mozilla...
git-svn-id: file:///svn/phpbb/trunk@1935 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
46fe80562a
commit
ddb00d8173
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user