diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-03-04 02:49:48 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-06-03 16:24:12 +0200 |
| commit | 5fa25880e23f1ad72321da2e04c574d99f5546a2 (patch) | |
| tree | 4785226fd6d7669bc89bfe56442130129af25673 | |
| parent | 50e3173e8c2f8304ad79e228df8526f9caf7b999 (diff) | |
| download | forums-5fa25880e23f1ad72321da2e04c574d99f5546a2.tar forums-5fa25880e23f1ad72321da2e04c574d99f5546a2.tar.gz forums-5fa25880e23f1ad72321da2e04c574d99f5546a2.tar.bz2 forums-5fa25880e23f1ad72321da2e04c574d99f5546a2.tar.xz forums-5fa25880e23f1ad72321da2e04c574d99f5546a2.zip | |
[ticket/11586] Move $filedata['thumbnail'] to where it might be returned.
PHPBB3-11586
| -rw-r--r-- | phpBB/includes/functions_posting.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index d6f7c9bab4..b9b518ad32 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -425,9 +425,6 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage // Whether the uploaded file is in the image category $is_image = (isset($extensions[$file->get('extension')]['display_cat'])) ? $extensions[$file->get('extension')]['display_cat'] == ATTACHMENT_CATEGORY_IMAGE : false; - // Do we have to create a thumbnail? - $filedata['thumbnail'] = ($is_image && $config['img_create_thumbnail']) ? 1 : 0; - if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id)) { // Check Image Size, if it is an image @@ -455,6 +452,9 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage // Only then perform additional image checks. $file->move_file($config['upload_path'], false, !$is_image); + // Do we have to create a thumbnail? + $filedata['thumbnail'] = ($is_image && $config['img_create_thumbnail']) ? 1 : 0; + if (sizeof($file->error)) { $file->remove(); |