aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-01-30 23:04:29 +0100
committerMarc Alexander <admin@m-a-styles.de>2014-06-23 21:39:24 +0200
commitde404002c75f770cc923262b9c16d899662ae114 (patch)
tree138ff6f04f7a1474836c30509498514dd17e8fc6
parentc22983cbdb75b687fb5d75444b0e919460dca65b (diff)
downloadforums-de404002c75f770cc923262b9c16d899662ae114.tar
forums-de404002c75f770cc923262b9c16d899662ae114.tar.gz
forums-de404002c75f770cc923262b9c16d899662ae114.tar.bz2
forums-de404002c75f770cc923262b9c16d899662ae114.tar.xz
forums-de404002c75f770cc923262b9c16d899662ae114.zip
[ticket/11148] Default to application/octet-stream if no mimetype given
This should prevent us from having an empty mimetype while uploading a file using local_upload(). PHPBB3-11148
-rw-r--r--phpBB/includes/functions_upload.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index fb153a9e0c..c3381aa68b 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -676,7 +676,7 @@ class fileupload
{
$upload['name'] = utf8_basename($source_file);
$upload['size'] = 0;
- $mimetype = '';
+ $mimetype = 'application/octet-stream';
}
else
{