4 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index cb6dbd7d68..e03ef72b3a 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -79,7 +79,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form_acp()
+	public function prepare_form_acp($user)
 	{
 		return array();
 	}
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 836c45b49f..5d6d6b10ac 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -69,11 +69,13 @@ interface phpbb_avatar_driver_interface
 	/**
 	* Prepare form for changing the acp settings of this avatar
 	*
+	* @param phpbb_user $user phpBB user object
+	*
 	* @return array Array of configuration options as consumed by acp_board.
 	*        The setting for enabling/disabling the avatar will be handled by
 	*        the avatar manager.
 	*/
-	public function prepare_form_acp();
+	public function prepare_form_acp($user);
 
 	/**
 	* Process form data
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index e49b8dd07f..f82c9a6c74 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -104,7 +104,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form_acp()
+	public function prepare_form_acp($user)
 	{
 		return array(
 			'avatar_gallery_path'	=> array('lang' => 'AVATAR_GALLERY_PATH',	'validate' => 'rpath',	'type' => 'text:20:255', 'explain' => true),
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']),