aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-07-15 21:30:42 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-09-09 08:28:03 +0200
commit759a1a09fae5147afe346729764f050ecc67076b (patch)
tree0d1c3811e94f5202cb310fe9526224d9d5e5de0c
parent57ccfe0c483254e54b7b40bc1906ef946daf4f55 (diff)
downloadforums-759a1a09fae5147afe346729764f050ecc67076b.tar
forums-759a1a09fae5147afe346729764f050ecc67076b.tar.gz
forums-759a1a09fae5147afe346729764f050ecc67076b.tar.bz2
forums-759a1a09fae5147afe346729764f050ecc67076b.tar.xz
forums-759a1a09fae5147afe346729764f050ecc67076b.zip
[ticket/13904] Fix remote upload functional tests
PHPBB3-13904
-rw-r--r--phpBB/phpbb/files/types/remote.php2
-rw-r--r--tests/functional/fileupload_remote_test.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/files/types/remote.php b/phpBB/phpbb/files/types/remote.php
index c70f1557e7..04263f9cba 100644
--- a/phpBB/phpbb/files/types/remote.php
+++ b/phpBB/phpbb/files/types/remote.php
@@ -234,7 +234,7 @@ class remote extends base
/** @var filespec $file */
$file = $this->factory->get('filespec')
->set_upload_ary($upload_ary)
- ->set_upload_namespace($this);
+ ->set_upload_namespace($this->upload);
$this->upload->common_checks($file);
return $file;
diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php
index 0f1e4d6e59..1bb63719c6 100644
--- a/tests/functional/fileupload_remote_test.php
+++ b/tests/functional/fileupload_remote_test.php
@@ -56,6 +56,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
$container->set('files.filespec', new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path));
$this->factory = new \phpbb\files\factory($container);
$container->set('files.factory', $this->factory);
+ $container->set('files.types.remote', new \phpbb\files\types\remote($this->factory, $this->language, $this->request));
$this->phpbb_root_path = $phpbb_root_path;
}