From 94a81fa01d0106f6deba6cbb9000f4c8bbbf607a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 9 Jan 2014 23:53:19 +0100 Subject: [ticket/11148] Pass mimetype guesser to upload_attachment() function PHPBB3-11148 --- phpBB/includes/message_parser.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'phpBB/includes/message_parser.php') 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 @@ -1082,6 +1082,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 */ @@ -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; + } } -- cgit v1.2.1 From a402d619b458df69ae9c336f3324b357fcd1a52a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 15 Mar 2014 12:25:33 +0100 Subject: [ticket/11148] Get rid of extra line in mimetype guesser setter doc block PHPBB3-11148 --- phpBB/includes/message_parser.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'phpBB/includes/message_parser.php') diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 19571d6bd3..7cee4252a3 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1802,8 +1802,7 @@ class parse_message extends bbcode_firstpass /** * Setter function for passing the mimetype_guesser object * - * @param \phpbb\mimetype\guesser $mimetype_guesser The mimetype_guesser - * object + * @param \phpbb\mimetype\guesser $mimetype_guesser The mimetype_guesser object * * @return null */ -- cgit v1.2.1