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

[ticket/13904] Fix tests after changes to factory

Browse Source 
PHPBB3-13904
This commit is contained in:
Marc Alexander
2015-09-09 12:58:22 +02:00
parent 5f91f1cad8
commit 40e614f564
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/avatar/driver/upload.php
View File

@@ -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
{

2
phpBB/phpbb/files/upload.php
View File

@@ -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;