2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index 2bd23a26a8..a0c23cb624 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -116,7 +116,7 @@ class upload extends \phpbb\avatar\driver\driver
 
 		if (!empty($upload_file['name']))
 		{
-			$file = $upload->handle_upload('form', 'avatar_upload_file');
+			$file = $upload->handle_upload('files.types.form', 'avatar_upload_file');
 		}
 		else if (!empty($this->config['allow_avatar_remote_upload']) && !empty($url))
 		{
@@ -146,7 +146,7 @@ class upload extends \phpbb\avatar\driver\driver
 				return false;
 			}
 
-			$file = $upload->handle_upload('remote', $url);
+			$file = $upload->handle_upload('files.types.remote', $url);
 		}
 		else
 		{
diff --git a/phpBB/phpbb/files/upload.php b/phpBB/phpbb/files/upload.php
index 45ff1c372f..e011e714e5 100644
--- a/phpBB/phpbb/files/upload.php
+++ b/phpBB/phpbb/files/upload.php
@@ -197,7 +197,7 @@ class upload
 	{
 		$args = func_get_args();
 		array_shift($args);
-		$type_class = $this->factory->get('types.' . $type)
+		$type_class = $this->factory->get($type)
 			->set_upload($this);
 
 		return (is_object($type_class)) ? call_user_func_array(array($type_class, 'upload'), $args) : false;