diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-02-19 12:24:21 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-02-19 12:24:21 +0100 |
| commit | 2302cd7a42004b288c5f6be6d0e4b63fe363a983 (patch) | |
| tree | d3bae66eedd762a2b92140ac8242279279c6b07c /phpBB/includes/ucp | |
| parent | f09e6865f70b7b3dfedd2d436396a555a29ebe10 (diff) | |
| download | forums-2302cd7a42004b288c5f6be6d0e4b63fe363a983.tar forums-2302cd7a42004b288c5f6be6d0e4b63fe363a983.tar.gz forums-2302cd7a42004b288c5f6be6d0e4b63fe363a983.tar.bz2 forums-2302cd7a42004b288c5f6be6d0e4b63fe363a983.tar.xz forums-2302cd7a42004b288c5f6be6d0e4b63fe363a983.zip | |
[feature/avatars] Pass phpbb_user to prepare and process form functions
The phpbb_user object might be used for language variables and other
things.
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 9635fcf079..8516682633 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -526,7 +526,7 @@ class ucp_groups if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete')) { $driver = $phpbb_avatar_manager->get_driver($driver_name); - $result = $driver->process_form($request, $template, $avatar_data, $avatar_error); + $result = $driver->process_form($request, $template, $user, $avatar_data, $avatar_error); if ($result && empty($avatar_error)) { @@ -657,7 +657,7 @@ class ucp_groups 'avatar' => $driver->get_template_name(), )); - if ($driver->prepare_form($request, $template, $avatar_data, $avatar_error)) + if ($driver->prepare_form($request, $template, $user, $avatar_data, $avatar_error)) { $driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver); $driver_upper = strtoupper($driver_name); diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 518ad9d917..326514aaef 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -576,7 +576,7 @@ class ucp_profile if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete')) { $driver = $phpbb_avatar_manager->get_driver($driver_name); - $result = $driver->process_form($request, $template, $avatar_data, $error); + $result = $driver->process_form($request, $template, $user, $avatar_data, $error); if ($result && empty($error)) { @@ -641,7 +641,7 @@ class ucp_profile 'avatar' => $driver->get_template_name(), )); - if ($driver->prepare_form($request, $template, $avatar_data, $error)) + if ($driver->prepare_form($request, $template, $user, $avatar_data, $error)) { $driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver); $driver_upper = strtoupper($driver_name); |