aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-11-03 20:35:24 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-11-03 20:35:24 +0100
commitc783c37c73beb2756d900f18dd24430c1b9f41ff (patch)
tree81bfded9172093113bd9d952a26532cfd361d388 /phpBB/config
parent8b7f711a184220928f42d5ec079af18d259981d0 (diff)
parentf991e484da91e24f82fbcb05d0b2ae11ca51852b (diff)
downloadforums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar
forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar.gz
forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar.bz2
forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar.xz
forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.zip
Merge pull request #3995 from CHItA/ticket/14044
[ticket/14044] Deduplicate the installers * CHItA/ticket/14044: [ticket/14044] Add config as global in notify user [ticket/14044] Fix language selection data loss [ticket/14044] Patch language::set_fallback_array() [ticket/14044] Fix tests [ticket/14044] Fix wrong descriptions in install [ticket/14044] Solve missing email template error [ticket/14044] global $table_prefix in constants.php [ticket/14044] Try to fix missing table prefix [ticket/14044] Use the correct language file version [ticket/14044] Automatically trigger rollback on insert in transaction [ticket/14044] Use empty instead of !count [ticket/14044] Fix Sqlite error in tests [ticket/14044] Deduplicate the installers
Diffstat (limited to 'phpBB/config')
-rw-r--r--phpBB/config/installer/container/parameters.yml3
-rw-r--r--phpBB/config/installer/container/services_install_filesystem.yml1
2 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/config/installer/container/parameters.yml b/phpBB/config/installer/container/parameters.yml
index 0447646806..f11f7e2d84 100644
--- a/phpBB/config/installer/container/parameters.yml
+++ b/phpBB/config/installer/container/parameters.yml
@@ -1,2 +1,5 @@
imports:
- { resource: ../../default/container/parameters.yml }
+
+parameters:
+ installer.create_config_file.options: []
diff --git a/phpBB/config/installer/container/services_install_filesystem.yml b/phpBB/config/installer/container/services_install_filesystem.yml
index 776d7b9198..0d52f07b5c 100644
--- a/phpBB/config/installer/container/services_install_filesystem.yml
+++ b/phpBB/config/installer/container/services_install_filesystem.yml
@@ -8,6 +8,7 @@ services:
- @installer.helper.iohandler
- %core.root_path%
- %core.php_ext%
+ - %installer.create_config_file.options%
tags:
- { name: install_filesystem_install, order: 10 }