diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-10-24 12:05:00 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-24 12:05:00 +0200 |
| commit | bc7ff47537bae4f6db9de781cf8ba3487e28a30b (patch) | |
| tree | 8cb137952d6b138c19e63f435c462cd93e091e5b /phpBB/phpbb/plupload | |
| parent | 24099583a32608c2350bdb10d018d6c8a0551e6c (diff) | |
| download | forums-bc7ff47537bae4f6db9de781cf8ba3487e28a30b.tar forums-bc7ff47537bae4f6db9de781cf8ba3487e28a30b.tar.gz forums-bc7ff47537bae4f6db9de781cf8ba3487e28a30b.tar.bz2 forums-bc7ff47537bae4f6db9de781cf8ba3487e28a30b.tar.xz forums-bc7ff47537bae4f6db9de781cf8ba3487e28a30b.zip | |
[ticket/11912] Supply filename to content_guesser for guessing on windows
The filename of the files sent to the guesser by plupload do not contain
the file extension. Therefore, it's impossible to guess the mimetype if
only the content_guesser is available and the function mime_content_type()
doesn't exist. By supplying the filename we can circumvent this issue.
PHPBB3-11912
Diffstat (limited to 'phpBB/phpbb/plupload')
| -rw-r--r-- | phpBB/phpbb/plupload/plupload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php index 29a4aff39b..dedc3cbcd4 100644 --- a/phpBB/phpbb/plupload/plupload.php +++ b/phpBB/phpbb/plupload/plupload.php @@ -135,7 +135,7 @@ class plupload 'tmp_name' => $file_path, 'name' => $this->request->variable('real_filename', ''), 'size' => filesize($file_path), - 'type' => $this->mimetype_guesser->guess($file_path), + 'type' => $this->mimetype_guesser->guess($file_path, $file_name), ); } else |