diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-01-08 15:42:30 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-01-08 15:42:30 +0100 |
| commit | 9e001153d6a64a90353207c4da8b01329f8e39e5 (patch) | |
| tree | 3afd717a1b7983c3c80065f93a41e0667efd08d1 /phpBB/includes/avatar/driver/upload.php | |
| parent | 8778c9c945e388c2b727f1b7cd057dd67a091441 (diff) | |
| download | forums-9e001153d6a64a90353207c4da8b01329f8e39e5.tar forums-9e001153d6a64a90353207c4da8b01329f8e39e5.tar.gz forums-9e001153d6a64a90353207c4da8b01329f8e39e5.tar.bz2 forums-9e001153d6a64a90353207c4da8b01329f8e39e5.tar.xz forums-9e001153d6a64a90353207c4da8b01329f8e39e5.zip | |
[feature/avatars] Pass phpbb_user object to prepare_form_acp()
The phpbb_user object might be used for language variables. Pass it as a
function argument to prepare_form_acp() instead of using globals.
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar/driver/upload.php')
| -rw-r--r-- | phpBB/includes/avatar/driver/upload.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php index 6e6956bfde..1e3c876299 100644 --- a/phpBB/includes/avatar/driver/upload.php +++ b/phpBB/includes/avatar/driver/upload.php @@ -122,10 +122,8 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver /** * @inheritdoc */ - public function prepare_form_acp() + public function prepare_form_acp($user) { - global $user; - return array( 'allow_avatar_remote_upload'=> array('lang' => 'ALLOW_REMOTE_UPLOAD', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'avatar_filesize' => array('lang' => 'MAX_FILESIZE', 'validate' => 'int:0', 'type' => 'text:4:10', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']), |