diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2010-08-30 14:55:50 +0100 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2010-08-30 14:55:50 +0100 |
| commit | ebb4a50d9ba539ea98d6af6f29adc1f25eadc4b0 (patch) | |
| tree | 46cf214e49106020d88753b90b73d2915d2c4c97 /phpBB/includes/functions_upload.php | |
| parent | bb4eb41088f55d3ed9a8ee7d1ec3e170e1122034 (diff) | |
| parent | dd63f57344321a47eac235005ff9975aafa3051e (diff) | |
| download | forums-ebb4a50d9ba539ea98d6af6f29adc1f25eadc4b0.tar forums-ebb4a50d9ba539ea98d6af6f29adc1f25eadc4b0.tar.gz forums-ebb4a50d9ba539ea98d6af6f29adc1f25eadc4b0.tar.bz2 forums-ebb4a50d9ba539ea98d6af6f29adc1f25eadc4b0.tar.xz forums-ebb4a50d9ba539ea98d6af6f29adc1f25eadc4b0.zip | |
Merge branch 'ticket/bantu/9615' into develop-olympus
* ticket/bantu/9615:
[ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()
Diffstat (limited to 'phpBB/includes/functions_upload.php')
| -rw-r--r-- | phpBB/includes/functions_upload.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 51fed45ebd..7f09cc1640 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -58,8 +58,9 @@ class filespec $this->filename = $upload_ary['tmp_name']; $this->filesize = $upload_ary['size']; - $name = trim(utf8_htmlspecialchars(utf8_basename($upload_ary['name']))); - $this->realname = $this->uploadname = (STRIP) ? stripslashes($name) : $name; + $name = (STRIP) ? stripslashes($upload_ary['name']) : $upload_ary['name']; + $name = trim(utf8_htmlspecialchars(utf8_basename($name))); + $this->realname = $this->uploadname = $name; $this->mimetype = $upload_ary['type']; // Opera adds the name to the mime type |