diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-08-10 01:02:27 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-08-10 01:02:27 +0200 |
| commit | b000d10ef8000bba3a029872a47318a2177e9ab2 (patch) | |
| tree | e13a2781137b2b6578c6d94c60a73e32e7498e06 /phpBB | |
| parent | 6a8413f064a0a8ade332634c2a891e8ca9038a8b (diff) | |
| parent | 076d4ddd7f146092ce79b4ea1d11b5731ed2e695 (diff) | |
| download | forums-b000d10ef8000bba3a029872a47318a2177e9ab2.tar forums-b000d10ef8000bba3a029872a47318a2177e9ab2.tar.gz forums-b000d10ef8000bba3a029872a47318a2177e9ab2.tar.bz2 forums-b000d10ef8000bba3a029872a47318a2177e9ab2.tar.xz forums-b000d10ef8000bba3a029872a47318a2177e9ab2.zip | |
Merge pull request #2849 from bantu/ticket/12941
[ticket/12941] Check for Sami parse errors on Travis CI.
* bantu/ticket/12941:
[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')
| -rw-r--r-- | phpBB/includes/functions_upload.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 1 |
2 files changed, 2 insertions, 1 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 */ diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index edc5941602..f5ba50451a 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -27,7 +27,6 @@ class upload extends \phpbb\avatar\driver\driver * Construct a driver object * * @param \phpbb\config\config $config phpBB configuration - * @param \phpbb\request\request $request Request object * @param string $phpbb_root_path Path to the phpBB root * @param string $php_ext PHP file extension * @param \phpbb_path_helper $path_helper phpBB path helper |