aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-08-09 18:08:49 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-08-09 18:08:49 +0200
commit076d4ddd7f146092ce79b4ea1d11b5731ed2e695 (patch)
treeaff826ac9ca66c9ec5d4704f6db1df655ac09ee4
parent873d1c6d575345619fb2c8ed65b9742dec59a338 (diff)
downloadforums-076d4ddd7f146092ce79b4ea1d11b5731ed2e695.tar
forums-076d4ddd7f146092ce79b4ea1d11b5731ed2e695.tar.gz
forums-076d4ddd7f146092ce79b4ea1d11b5731ed2e695.tar.bz2
forums-076d4ddd7f146092ce79b4ea1d11b5731ed2e695.tar.xz
forums-076d4ddd7f146092ce79b4ea1d11b5731ed2e695.zip
[ticket/12941] Fix remaining Sami complaints.
PHPBB3-12941
-rw-r--r--phpBB/includes/functions_upload.php2
-rw-r--r--phpBB/phpbb/avatar/driver/upload.php1
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