diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-08-07 12:06:49 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-08-07 12:06:49 +0200 |
| commit | 89a6fed91d9344152f0b2a0779d3d458f3311ecf (patch) | |
| tree | 7979f44c8d5bd6532491fe2261acc4fa348b8fe2 /phpBB/includes/message_parser.php | |
| parent | 57f9a96f4b64c323448dfb83ed0816a2abe727e7 (diff) | |
| parent | b203b4afa18e7e4774bec525620ec2a390ac374f (diff) | |
| download | forums-89a6fed91d9344152f0b2a0779d3d458f3311ecf.tar forums-89a6fed91d9344152f0b2a0779d3d458f3311ecf.tar.gz forums-89a6fed91d9344152f0b2a0779d3d458f3311ecf.tar.bz2 forums-89a6fed91d9344152f0b2a0779d3d458f3311ecf.tar.xz forums-89a6fed91d9344152f0b2a0779d3d458f3311ecf.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index da27d8900d..92ace7b585 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1083,6 +1083,12 @@ class parse_message extends bbcode_firstpass protected $plupload; /** + * The mimetype guesser object used for attachment mimetypes + * @var \phpbb\mimetype\guesser + */ + protected $mimetype_guesser; + + /** * Init - give message here or manually */ function parse_message($message = '') @@ -1560,7 +1566,7 @@ class parse_message extends bbcode_firstpass { if ($num_attachments < $cfg['max_attachments'] || $auth->acl_gets('m_', 'a_', $forum_id)) { - $filedata = upload_attachment($form_name, $forum_id, false, '', $is_message, false, $this->plupload); + $filedata = upload_attachment($form_name, $forum_id, false, '', $is_message, false, $this->mimetype_guesser, $this->plupload); $error = array_merge($error, $filedata['error']); if (!sizeof($error)) @@ -1792,4 +1798,16 @@ class parse_message extends bbcode_firstpass { $this->plupload = $plupload; } + + /** + * Setter function for passing the mimetype_guesser object + * + * @param \phpbb\mimetype\guesser $mimetype_guesser The mimetype_guesser object + * + * @return null + */ + public function set_mimetype_guesser(\phpbb\mimetype\guesser $mimetype_guesser) + { + $this->mimetype_guesser = $mimetype_guesser; + } } |