mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +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/ucp/ucp_groups.php
View File

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