diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-24 11:29:56 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-24 11:29:56 +0000 |
| commit | 9e5c25504e275d8de071f2efafa349ebee21063c (patch) | |
| tree | 86d37c1ed2b20eca9575084be7668d7b32dcf644 /phpBB/includes/functions_upload.php | |
| parent | 180a5a243d03803fef0d32a6aaa2d6899a83dfcc (diff) | |
| download | forums-9e5c25504e275d8de071f2efafa349ebee21063c.tar forums-9e5c25504e275d8de071f2efafa349ebee21063c.tar.gz forums-9e5c25504e275d8de071f2efafa349ebee21063c.tar.bz2 forums-9e5c25504e275d8de071f2efafa349ebee21063c.tar.xz forums-9e5c25504e275d8de071f2efafa349ebee21063c.zip | |
- added confirm box to ucp zebra (adding fried/foe)
- permission fixes for conversions
- use more appropiate error message within convertor if source tables could not be found
- other tiny fixes
git-svn-id: file:///svn/phpbb/trunk@6925 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 e28c7fa64f..33556e1893 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -50,8 +50,8 @@ class filespec $this->filename = $upload_ary['tmp_name']; $this->filesize = $upload_ary['size']; - $this->realname = $this->uploadname = trim(htmlspecialchars(basename($upload_ary['name']))); - $this->mimetype = $upload_ary['type']; + $name = trim(htmlspecialchars(basename($upload_ary['name']))); + $this->realname = $this->uploadname = (STRIP) ? stripslashes($name) : $name; // Opera adds the name to the mime type $this->mimetype = (strpos($this->mimetype, '; name') !== false) ? str_replace(strstr($this->mimetype, '; name'), '', $this->mimetype) : $this->mimetype; |