diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-01-07 22:49:48 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-01-07 23:02:07 +0100 |
| commit | 023d7a972dd5c279e0b0b24801f9e53e7865d39a (patch) | |
| tree | 441a940978d677ff310b951f664043ddb7726462 /phpBB/includes/avatar/driver/upload.php | |
| parent | 8867cb60b1f7074c9f83c0403e5259148da65204 (diff) | |
| download | forums-023d7a972dd5c279e0b0b24801f9e53e7865d39a.tar forums-023d7a972dd5c279e0b0b24801f9e53e7865d39a.tar.gz forums-023d7a972dd5c279e0b0b24801f9e53e7865d39a.tar.bz2 forums-023d7a972dd5c279e0b0b24801f9e53e7865d39a.tar.xz forums-023d7a972dd5c279e0b0b24801f9e53e7865d39a.zip | |
[feature/avatars] Remove $request property and pass as argument if needed
Remove the $request property from the phpbb_avatar_driver class and rather
pass it as function argument if it's needed in a function. Currently this
is only the case for the class methods prepare_form() and process_form().
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar/driver/upload.php')
| -rw-r--r-- | phpBB/includes/avatar/driver/upload.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php index 1bb86cf158..6e6956bfde 100644 --- a/phpBB/includes/avatar/driver/upload.php +++ b/phpBB/includes/avatar/driver/upload.php @@ -36,7 +36,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver /** * @inheritdoc */ - public function prepare_form($template, $row, &$error) + public function prepare_form($request, $template, $row, &$error) { if (!$this->can_upload()) { @@ -54,7 +54,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver /** * @inheritdoc */ - public function process_form($template, $row, &$error) + public function process_form($request, $template, $row, &$error) { if (!$this->can_upload()) { @@ -68,8 +68,8 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver $upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false)); - $url = $this->request->variable('avatar_upload_url', ''); - $upload_file = $this->request->file('avatar_upload_file'); + $url = $request->variable('avatar_upload_url', ''); + $upload_file = $request->file('avatar_upload_file'); if (!empty($upload_file['name'])) { |