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/acp/acp_users.php | |
| 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/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 61b644e9f5..88becdb3a5 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1751,7 +1751,7 @@ class acp_users 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)) { @@ -1813,7 +1813,7 @@ class acp_users 'avatar' => "acp_avatar_options_{$config_name}.html", )); - 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); |