diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-17 13:23:13 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-17 13:23:13 +0000 |
| commit | fbd741606055ed75c0ff1bc2a110d880cad4cbd4 (patch) | |
| tree | 99955b09aec69e65b73bf7592bf7e4dc4651638f /phpBB/includes/functions_posting.php | |
| parent | a2c81d763fa2e591bf3aa8f48ffeed4beb363975 (diff) | |
| download | forums-fbd741606055ed75c0ff1bc2a110d880cad4cbd4.tar forums-fbd741606055ed75c0ff1bc2a110d880cad4cbd4.tar.gz forums-fbd741606055ed75c0ff1bc2a110d880cad4cbd4.tar.bz2 forums-fbd741606055ed75c0ff1bc2a110d880cad4cbd4.tar.xz forums-fbd741606055ed75c0ff1bc2a110d880cad4cbd4.zip | |
#11074 - only process and check (as well as display) images if the category also matches. ;)
git-svn-id: file:///svn/phpbb/trunk@7616 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 9fe27fdd1a..d75a548d1b 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -408,7 +408,11 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage } $file->clean_filename('unique', $user->data['user_id'] . '_'); - $file->move_file($config['upload_path']); + + // Are we uploading an image *and* this image being within the image category? Only then perform additional image checks. + $no_image = ($cat_id == ATTACHMENT_CATEGORY_IMAGE) ? false : true; + + $file->move_file($config['upload_path'], false, $no_image); if (sizeof($file->error)) { |