[ticket/15276] Resolve conflicts

PHPBB3-15276
2025-07-30 21:40:43 +02:00 · 2017-07-20 07:56:05 +02:00
parent 0417482d55
commit ef00bb4da5
3 changed files with 1 additions and 8 deletions
--- a/phpBB/config/default/container/services_files.yml
+++ b/phpBB/config/default/container/services_files.yml
@@ -12,6 +12,7 @@ services:
            - '@language'
            - '@php_ini'
            - '@upload_imagesize'
+            - '%core.root_path%'
            - '@mimetype.guesser'
            - '@plupload'

--- a/phpBB/config/default/container/services_storage.yml
+++ b/phpBB/config/default/container/services_storage.yml
@@ -12,7 +12,6 @@ services:
        class: phpbb\storage\adapter_factory
        arguments:
            - '@config'
-            - '@service_container'
            - '@storage.adapter_collection'
            - '@storage.provider_collection'