diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-01-09 23:53:19 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-06-23 21:37:47 +0200 |
| commit | 94a81fa01d0106f6deba6cbb9000f4c8bbbf607a (patch) | |
| tree | 0c33b9e5252b4c4f3d24b1aea49d4443db2ff44c /phpBB/includes/message_parser.php | |
| parent | 9bc6e641bfbe53c3920662ee8e24a723ac34e6a1 (diff) | |
| download | forums-94a81fa01d0106f6deba6cbb9000f4c8bbbf607a.tar forums-94a81fa01d0106f6deba6cbb9000f4c8bbbf607a.tar.gz forums-94a81fa01d0106f6deba6cbb9000f4c8bbbf607a.tar.bz2 forums-94a81fa01d0106f6deba6cbb9000f4c8bbbf607a.tar.xz forums-94a81fa01d0106f6deba6cbb9000f4c8bbbf607a.zip | |
[ticket/11148] Pass mimetype guesser to upload_attachment() function
PHPBB3-11148
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 8d926ec70a..19571d6bd3 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,17 @@ 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; + } } |