mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[feature/avatars] Remove $request property and pass as argument if needed

Browse Source 
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
This commit is contained in:
Marc Alexander
2013-01-07 22:49:48 +01:00
parent 8867cb60b1
commit 023d7a972d
12 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -338,7 +338,7 @@ class acp_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($template, $avatar_data, $avatar_error);
$result = $driver->process_form($request, $template, $avatar_data, $avatar_error);
if ($result && empty($avatar_error))
{
@@ -532,7 +532,7 @@ class acp_groups
'avatar' => "acp_avatar_options_{$config_name}.html",
));
if ($driver->prepare_form($template, $avatar_data, $avatar_error))
if ($driver->prepare_form($request, $template, $avatar_data, $avatar_error))
{
$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
$driver_upper = strtoupper($driver_name);