mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 06:51:33 +02:00
Code Issues Releases Wiki Activity

[feature/avatars] Pass phpbb_user to prepare and process form functions

Browse Source 
The phpbb_user object might be used for language variables and other
things.

PHPBB3-10018
This commit is contained in:
Marc Alexander
2013-02-19 12:24:21 +01:00
parent f09e6865f7
commit 2302cd7a42
11 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_users.php
View File

@@ -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);