diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-07-15 13:35:38 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-09-09 08:27:57 +0200 |
| commit | f9b69e73d4b754c7c5bab52d16b2df98812e5570 (patch) | |
| tree | f693234b7c6db959b3dd3b1bf2141517db1c2a8e | |
| parent | 11b2c938c6c3a6a14465f04ed356fbd013276143 (diff) | |
| download | forums-f9b69e73d4b754c7c5bab52d16b2df98812e5570.tar forums-f9b69e73d4b754c7c5bab52d16b2df98812e5570.tar.gz forums-f9b69e73d4b754c7c5bab52d16b2df98812e5570.tar.bz2 forums-f9b69e73d4b754c7c5bab52d16b2df98812e5570.tar.xz forums-f9b69e73d4b754c7c5bab52d16b2df98812e5570.zip | |
[ticket/13904] Fix minor coding issues and don't use form_upload anymore
PHPBB3-13904
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/files/types/form.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index c1ce18cb12..ab5325f88a 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -116,7 +116,7 @@ class upload extends \phpbb\avatar\driver\driver if (!empty($upload_file['name'])) { - $file = $upload->form_upload('avatar_upload_file'); + $file = $upload->handle_upload('form', 'avatar_upload_file'); } else if (!empty($this->config['allow_avatar_remote_upload']) && !empty($url)) { diff --git a/phpBB/phpbb/files/types/form.php b/phpBB/phpbb/files/types/form.php index 5c5c332906..d82df46fac 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], $args[1]); + return $this->form_upload($args[0], (isset($args[1])) ? $args[1] : null); } /** |