diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-08-10 01:02:38 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-08-10 01:02:38 +0200 |
| commit | 59b5ab4866e4c687c9157898110fd0e556f6c6ac (patch) | |
| tree | 2e58406d62e19ffaaf9670cf80740df445a81699 /phpBB/includes/functions_upload.php | |
| parent | 1c98b46625518a7b398f7f81536ade01be2e937d (diff) | |
| parent | b000d10ef8000bba3a029872a47318a2177e9ab2 (diff) | |
| download | forums-59b5ab4866e4c687c9157898110fd0e556f6c6ac.tar forums-59b5ab4866e4c687c9157898110fd0e556f6c6ac.tar.gz forums-59b5ab4866e4c687c9157898110fd0e556f6c6ac.tar.bz2 forums-59b5ab4866e4c687c9157898110fd0e556f6c6ac.tar.xz forums-59b5ab4866e4c687c9157898110fd0e556f6c6ac.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12941] Fix remaining Sami complaints.
[ticket/12941] Check for Sami parse errors on Travis CI.
[ticket/12941] Add sami.conf.php for Travis CI.
Diffstat (limited to 'phpBB/includes/functions_upload.php')
| -rw-r--r-- | phpBB/includes/functions_upload.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index e973e6ec28..a0a67ccf3d 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -586,6 +586,7 @@ class fileupload * Upload file from users harddisk * * @param string $form_name Form name assigned to the file input field (if it is an array, the key has to be specified) + * @param \phpbb\mimetype\guesser $mimetype_guesser Mimetype guesser * @param \phpbb\plupload\plupload $plupload The plupload object * * @return object $file Object "filespec" is returned, all further operations can be done with this object @@ -743,6 +744,7 @@ class fileupload * Uploads file from given url * * @param string $upload_url URL pointing to file to upload, for example http://www.foobar.com/example.gif + * @param \phpbb\mimetype\guesser $mimetype_guesser Mimetype guesser * @return object $file Object "filespec" is returned, all further operations can be done with this object * @access public */ |