mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-21 16:01:40 +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/avatar/driver/remote.php
View File

@@ -36,7 +36,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
/**
* @inheritdoc
*/
public function prepare_form($request, $template, $row, &$error)
public function prepare_form($request, $template, $user, $row, &$error)
{
$template->assign_vars(array(
'AVATAR_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_remote_width', 0),
@@ -50,7 +50,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
/**
* @inheritdoc
*/
public function process_form($request, $template, $row, &$error)
public function process_form($request, $template, $user, $row, &$error)
{
$url = $request->variable('avatar_remote_url', '');
$width = $request->variable('avatar_remote_width', 0);