aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/files
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-06-01 13:57:17 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-09-09 08:27:40 +0200
commita96e7a8ec6efa483b47dca3395ee2de608cfc675 (patch)
treec4bdf6d31a8190bcd068521714db559185322afc /phpBB/phpbb/files
parent186b4495b625a40459618f01784b814a29f98ae0 (diff)
downloadforums-a96e7a8ec6efa483b47dca3395ee2de608cfc675.tar
forums-a96e7a8ec6efa483b47dca3395ee2de608cfc675.tar.gz
forums-a96e7a8ec6efa483b47dca3395ee2de608cfc675.tar.bz2
forums-a96e7a8ec6efa483b47dca3395ee2de608cfc675.tar.xz
forums-a96e7a8ec6efa483b47dca3395ee2de608cfc675.zip
[ticket/13904] Get rid of useless parameters and variables
PHPBB3-13904
Diffstat (limited to 'phpBB/phpbb/files')
-rw-r--r--phpBB/phpbb/files/upload.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/phpbb/files/upload.php b/phpBB/phpbb/files/upload.php
index 8666b857a5..1892d22adf 100644
--- a/phpBB/phpbb/files/upload.php
+++ b/phpBB/phpbb/files/upload.php
@@ -131,13 +131,12 @@ class upload
* 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
* @access public
*/
- function form_upload($form_name, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null)
+ function form_upload($form_name, \phpbb\plupload\plupload $plupload = null)
{
global $user, $request, $phpbb_container;
@@ -216,7 +215,7 @@ class upload
/**
* Move file from another location to phpBB
*/
- function local_upload($source_file, $filedata = false, \phpbb\mimetype\guesser $mimetype_guesser = null)
+ function local_upload($source_file, $filedata = false)
{
global $user, $request, $phpbb_container;
@@ -295,11 +294,10 @@ class upload
* 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
*/
- function remote_upload($upload_url, \phpbb\mimetype\guesser $mimetype_guesser = null)
+ function remote_upload($upload_url)
{
global $user, $phpbb_root_path, $phpbb_container;