diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-06-03 15:58:21 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-06-03 15:58:21 +0200 |
| commit | a3d15938047fb02a12276805427682beb36e5184 (patch) | |
| tree | f6423fe3afd2339711b0390afdcae00efc441362 | |
| parent | 1cd6bb88a67d4f304060850847bfaa4dc91b1149 (diff) | |
| parent | 8191755cca418ad2124e11e4e93559b9cad7d8bd (diff) | |
| download | forums-a3d15938047fb02a12276805427682beb36e5184.tar forums-a3d15938047fb02a12276805427682beb36e5184.tar.gz forums-a3d15938047fb02a12276805427682beb36e5184.tar.bz2 forums-a3d15938047fb02a12276805427682beb36e5184.tar.xz forums-a3d15938047fb02a12276805427682beb36e5184.zip | |
Merge remote-tracking branch 'erangamapa/ticket/11145' into develop-olympus
* erangamapa/ticket/11145:
[ticket/11145] Wrong error thrown when uploading a bigger image.
| -rw-r--r-- | phpBB/includes/functions_posting.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index e5cbae0d71..2e5130c5b8 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -423,16 +423,6 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage $cat_id = (isset($extensions[$file->get('extension')]['display_cat'])) ? $extensions[$file->get('extension')]['display_cat'] : ATTACHMENT_CATEGORY_NONE; - // Make sure the image category only holds valid images... - if ($cat_id == ATTACHMENT_CATEGORY_IMAGE && !$file->is_image()) - { - $file->remove(); - - // If this error occurs a user tried to exploit an IE Bug by renaming extensions - // Since the image category is displaying content inline we need to catch this. - trigger_error($user->lang['ATTACHED_IMAGE_NOT_IMAGE']); - } - // Do we have to create a thumbnail? $filedata['thumbnail'] = ($cat_id == ATTACHMENT_CATEGORY_IMAGE && $config['img_create_thumbnail']) ? 1 : 0; @@ -473,6 +463,16 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage return $filedata; } + // Make sure the image category only holds valid images... + if ($cat_id == ATTACHMENT_CATEGORY_IMAGE && !$file->is_image()) + { + $file->remove(); + + // If this error occurs a user tried to exploit an IE Bug by renaming extensions + // Since the image category is displaying content inline we need to catch this. + trigger_error($user->lang['ATTACHED_IMAGE_NOT_IMAGE']); + } + $filedata['filesize'] = $file->get('filesize'); $filedata['mimetype'] = $file->get('mimetype'); $filedata['extension'] = $file->get('extension'); |