diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-07-15 13:57:19 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-09-09 08:27:58 +0200 |
| commit | cf9b6ed4742f95b75125963935f4f2d9e9cfa62c (patch) | |
| tree | 9af95905db8cc33a95a645bf5b136a64daab0dce | |
| parent | f9b69e73d4b754c7c5bab52d16b2df98812e5570 (diff) | |
| download | forums-cf9b6ed4742f95b75125963935f4f2d9e9cfa62c.tar forums-cf9b6ed4742f95b75125963935f4f2d9e9cfa62c.tar.gz forums-cf9b6ed4742f95b75125963935f4f2d9e9cfa62c.tar.bz2 forums-cf9b6ed4742f95b75125963935f4f2d9e9cfa62c.tar.xz forums-cf9b6ed4742f95b75125963935f4f2d9e9cfa62c.zip | |
[ticket/13904] Use the class member plupload instead of argument
PHPBB3-13904
| -rw-r--r-- | phpBB/phpbb/files/types/form.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/phpBB/phpbb/files/types/form.php b/phpBB/phpbb/files/types/form.php index d82df46fac..130a64445b 100644 --- a/phpBB/phpbb/files/types/form.php +++ b/phpBB/phpbb/files/types/form.php @@ -52,7 +52,7 @@ class form implements type_interface public function upload() { $args = func_get_args(); - return $this->form_upload($args[0], (isset($args[1])) ? $args[1] : null); + return $this->form_upload($args[0]); } /** @@ -70,19 +70,18 @@ class form implements type_interface * 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 plupload $plupload The plupload object * * @return filespec $file Object "filespec" is returned, all further operations can be done with this object * @access public */ - protected function form_upload($form_name, plupload $plupload = null) + protected function form_upload($form_name) { $upload = $this->request->file($form_name); unset($upload['local_mode']); - if ($plupload) + if ($this->plupload) { - $result = $plupload->handle_upload($form_name); + $result = $this->plupload->handle_upload($form_name); if (is_array($result)) { $upload = array_merge($upload, $result); |