aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthe_systech <the_systech@users.sourceforge.net>2001-08-08 14:40:04 +0000
committerthe_systech <the_systech@users.sourceforge.net>2001-08-08 14:40:04 +0000
commit909b268b21e9b1542cc5e810c4dbdba534aa6538 (patch)
tree7b8137f2df461de36236962b188e722c9de2e8a4
parent2c5881f8a72f0a4129a3a2ecb33d7fb31631302c (diff)
downloadforums-909b268b21e9b1542cc5e810c4dbdba534aa6538.tar
forums-909b268b21e9b1542cc5e810c4dbdba534aa6538.tar.gz
forums-909b268b21e9b1542cc5e810c4dbdba534aa6538.tar.bz2
forums-909b268b21e9b1542cc5e810c4dbdba534aa6538.tar.xz
forums-909b268b21e9b1542cc5e810c4dbdba534aa6538.zip
Fixed problem with Mozilla in determining file type for uploaded file
git-svn-id: file:///svn/phpbb/trunk@815 89ea8834-ac86-4346-8a33-228a782c2dd0
-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 09fa5ef84c..01122f5c69 100644
--- a/phpBB/admin/admin_db_utilities.php
+++ b/phpBB/admin/admin_db_utilities.php
@@ -981,7 +981,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)$/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) )
{
@@ -1022,7 +1022,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'] );
}
}
else