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_upload.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_upload.php')
| -rw-r--r-- | phpBB/includes/functions_upload.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 93254a0d08..93b809f296 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -230,7 +230,7 @@ class filespec * @param octal $chmod Permission mask for chmodding the file after a successful move * @access public */ - function move_file($destination, $overwrite = false, $chmod = 0666) + function move_file($destination, $overwrite = false, $skip_image_check = false, $chmod = 0666) { global $user, $phpbb_root_path; @@ -315,7 +315,7 @@ class filespec // Try to get real filesize from destination folder $this->filesize = (@filesize($this->destination_file)) ? @filesize($this->destination_file) : $this->filesize; - if ($this->is_image()) + if ($this->is_image() && !$skip_image_check) { $this->width = $this->height = 0; |