aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_upload.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-06-02 11:57:37 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-06-23 21:39:24 +0200
commitff56f0dcfe6355a9bd24c1e33dee15c60d01526b (patch)
treec55de75341c66e8544356c16005765a88aa8e247 /phpBB/includes/functions_upload.php
parent3823fe355fbd5793247bc291e814ec46dc7334ec (diff)
downloadforums-ff56f0dcfe6355a9bd24c1e33dee15c60d01526b.tar
forums-ff56f0dcfe6355a9bd24c1e33dee15c60d01526b.tar.gz
forums-ff56f0dcfe6355a9bd24c1e33dee15c60d01526b.tar.bz2
forums-ff56f0dcfe6355a9bd24c1e33dee15c60d01526b.tar.xz
forums-ff56f0dcfe6355a9bd24c1e33dee15c60d01526b.zip
[ticket/11148] Remove unneeded variable mimetype and use type octet-stream
The variable $mimetype is not used in the method local_upload() afterwards so it shouldn't be assigned. The correct default mimetype should be application/octet-stream and not application/octetstream according to RFC 2046. PHPBB3-11148
Diffstat (limited to 'phpBB/includes/functions_upload.php')
-rw-r--r--phpBB/includes/functions_upload.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index f50ce9432f..0d33d32a1f 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -82,7 +82,7 @@ class filespec
if (!$this->mimetype)
{
- $this->mimetype = 'application/octetstream';
+ $this->mimetype = 'application/octet-stream';
}
$this->extension = strtolower(self::get_extension($this->realname));
@@ -673,7 +673,6 @@ class fileupload
{
$upload['name'] = utf8_basename($source_file);
$upload['size'] = 0;
- $mimetype = 'application/octet-stream';
}
else
{