diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 08:38:32 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 08:38:32 +0200 |
| commit | 359ef56e3538cb91f11587f77ecfc4bc423ebd96 (patch) | |
| tree | 55ba3ff202a1677cc4e7cc840e7484b4d70b34a1 /phpBB/phpbb/plupload/plupload.php | |
| parent | a0f1365953fb1a947dba69b710bd398132fec967 (diff) | |
| parent | bdf69817bef177778e55ef79a6a17fd211cb3a59 (diff) | |
| download | forums-359ef56e3538cb91f11587f77ecfc4bc423ebd96.tar forums-359ef56e3538cb91f11587f77ecfc4bc423ebd96.tar.gz forums-359ef56e3538cb91f11587f77ecfc4bc423ebd96.tar.bz2 forums-359ef56e3538cb91f11587f77ecfc4bc423ebd96.tar.xz forums-359ef56e3538cb91f11587f77ecfc4bc423ebd96.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13835] Normalize filename for attachments uploaded in chunks.
Diffstat (limited to 'phpBB/phpbb/plupload/plupload.php')
| -rw-r--r-- | phpBB/phpbb/plupload/plupload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php index 0e67ee209b..a47fc87adf 100644 --- a/phpBB/phpbb/plupload/plupload.php +++ b/phpBB/phpbb/plupload/plupload.php @@ -125,7 +125,7 @@ class plupload // Need to modify some of the $_FILES values to reflect the new file return array( 'tmp_name' => $file_path, - 'name' => $this->request->variable('real_filename', ''), + 'name' => $this->request->variable('real_filename', '', true), 'size' => filesize($file_path), 'type' => $this->mimetype_guesser->guess($file_path, $file_name), ); |