diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-10-04 16:30:34 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 20:59:48 +0100 |
| commit | 6cbb60d13f75da6d9b6c6d60555ea119df79b5c0 (patch) | |
| tree | 3977e49d0e6eee7bf153973a81f459b0b0a612f1 /phpBB/phpbb/di/extension/ext.php | |
| parent | 74cd97e75b1dce43a05d8e15e9fbccf01e833b57 (diff) | |
| download | forums-6cbb60d13f75da6d9b6c6d60555ea119df79b5c0.tar forums-6cbb60d13f75da6d9b6c6d60555ea119df79b5c0.tar.gz forums-6cbb60d13f75da6d9b6c6d60555ea119df79b5c0.tar.bz2 forums-6cbb60d13f75da6d9b6c6d60555ea119df79b5c0.tar.xz forums-6cbb60d13f75da6d9b6c6d60555ea119df79b5c0.zip | |
[ticket/12620] Adds a yaml config file
PHPBB3-12620
Diffstat (limited to 'phpBB/phpbb/di/extension/ext.php')
| -rw-r--r-- | phpBB/phpbb/di/extension/ext.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/di/extension/ext.php b/phpBB/phpbb/di/extension/ext.php index 330303ca0c..021e862118 100644 --- a/phpBB/phpbb/di/extension/ext.php +++ b/phpBB/phpbb/di/extension/ext.php @@ -48,16 +48,16 @@ class ext extends Extension $services_directory = false; $services_file = false; - if (file_exists($path . 'config/' . PHPBB_ENVIRONMENT . '/environment.yml')) + if (file_exists($path . 'config/' . PHPBB_ENVIRONMENT . '/container/environment.yml')) { - $services_directory = $path . 'config/' . PHPBB_ENVIRONMENT; + $services_directory = $path . 'config/' . PHPBB_ENVIRONMENT . '/container/'; $services_file = 'environment.yml'; } else if (!is_dir($path . 'config/' . PHPBB_ENVIRONMENT)) { - if (file_exists($path . 'config/default/environment.yml')) + if (file_exists($path . 'config/default/container/environment.yml')) { - $services_directory = $path . 'config/default'; + $services_directory = $path . 'config/default/container/'; $services_file = 'environment.yml'; } else if (!is_dir($path . 'config/default') && file_exists($path . '/config/services.yml')) |