diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-11-06 21:47:05 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-11-06 21:47:05 +0100 |
| commit | d8760568b6c13498f8bf26eb19d0a64af6373ff5 (patch) | |
| tree | 229a3b8bf0d5e710424c00fec91d8ffc52384e21 | |
| parent | 022c271caf6bdec2ec56abc5c45837d38b941e8e (diff) | |
| parent | a92083169a181a6524e383de657c78af1bff2887 (diff) | |
| download | forums-d8760568b6c13498f8bf26eb19d0a64af6373ff5.tar forums-d8760568b6c13498f8bf26eb19d0a64af6373ff5.tar.gz forums-d8760568b6c13498f8bf26eb19d0a64af6373ff5.tar.bz2 forums-d8760568b6c13498f8bf26eb19d0a64af6373ff5.tar.xz forums-d8760568b6c13498f8bf26eb19d0a64af6373ff5.zip | |
Merge pull request #4019 from prototech/ticket/14273
[ticket/14273] Remove unused core.root_path dependency in files.upload service
| -rw-r--r-- | phpBB/config/default/container/services_files.yml | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/files/upload.php | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index 425df6dc9b..2624ae5e06 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -25,7 +25,6 @@ services: - @language - @php_ini - @request - - %core.root_path% files.types.form: class: phpbb\files\types\form diff --git a/phpBB/phpbb/files/upload.php b/phpBB/phpbb/files/upload.php index e011e714e5..a9bf74094d 100644 --- a/phpBB/phpbb/files/upload.php +++ b/phpBB/phpbb/files/upload.php @@ -65,9 +65,6 @@ class upload /** @var request_interface Request class */ protected $request; - /** @var string phpBB root path */ - protected $phpbb_root_path; - /** * Init file upload class. * @@ -76,16 +73,14 @@ class upload * @param language $language Language class * @param \bantu\IniGetWrapper\IniGetWrapper $php_ini ini_get() wrapper * @param request_interface $request Request class - * @param string $phpbb_root_path phpBB root path */ - public function __construct(filesystem_interface $filesystem, factory $factory, language $language, \bantu\IniGetWrapper\IniGetWrapper $php_ini, request_interface $request, $phpbb_root_path) + public function __construct(filesystem_interface $filesystem, factory $factory, language $language, \bantu\IniGetWrapper\IniGetWrapper $php_ini, request_interface $request) { $this->filesystem = $filesystem; $this->factory = $factory; $this->language = $language; $this->php_ini = $php_ini; $this->request = $request; - $this->phpbb_root_path = $phpbb_root_path; } /** |