diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-08-07 12:06:33 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-08-07 12:06:33 +0200 |
| commit | b203b4afa18e7e4774bec525620ec2a390ac374f (patch) | |
| tree | ffaab499179ddddbf4f6debe766f0ccf764c596f /phpBB/posting.php | |
| parent | a8cb525f77059afe23629935150f8ef96e07d4f9 (diff) | |
| parent | ff56f0dcfe6355a9bd24c1e33dee15c60d01526b (diff) | |
| download | forums-b203b4afa18e7e4774bec525620ec2a390ac374f.tar forums-b203b4afa18e7e4774bec525620ec2a390ac374f.tar.gz forums-b203b4afa18e7e4774bec525620ec2a390ac374f.tar.bz2 forums-b203b4afa18e7e4774bec525620ec2a390ac374f.tar.xz forums-b203b4afa18e7e4774bec525620ec2a390ac374f.zip | |
Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus
* github-marc1706/ticket/11148:
[ticket/11148] Remove unneeded variable mimetype and use type octet-stream
[ticket/11148] Change expected output with disallowed content in test
[ticket/11148] Always use the output of the mimetype guesser in get_mimetype
[ticket/11148] Get rid of extra line in mimetype guesser setter doc block
[ticket/11148] Add missing parts to docblock of get_mimetype() method
[ticket/11148] Default to application/octet-stream if no mimetype given
[ticket/11148] Use mimetype guesser for uploaded avatars
[ticket/11148] Pass mimetype guesser to upload_attachment() function
[ticket/11148] Add mimetype guesser to filespec and fileupload class
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 70df052099..6638caa94b 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -523,7 +523,9 @@ $orig_poll_options_size = sizeof($post_data['poll_options']); $message_parser = new parse_message(); $plupload = $phpbb_container->get('plupload'); +$mimetype_guesser = $phpbb_container->get('mimetype.guesser'); $message_parser->set_plupload($plupload); +$message_parser->set_mimetype_guesser($mimetype_guesser); if (isset($post_data['post_text'])) { |