diff options
author | Andreas Fischer <bantu@phpbb.com> | 2014-05-02 23:04:33 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-02 23:04:33 +0200 |
commit | 56f881953db33f5aa9362de77ab635979b1e4b3b (patch) | |
tree | accb17f957ad42a627ee2592021e25c9a04ee106 /phpBB/phpbb | |
parent | dbb7552614dfb8af7bd8ac74988c52f06301a9f7 (diff) | |
parent | ed089f4b5fa072c9298bd1a2bffae97da4a2616c (diff) | |
download | forums-56f881953db33f5aa9362de77ab635979b1e4b3b.tar forums-56f881953db33f5aa9362de77ab635979b1e4b3b.tar.gz forums-56f881953db33f5aa9362de77ab635979b1e4b3b.tar.bz2 forums-56f881953db33f5aa9362de77ab635979b1e4b3b.tar.xz forums-56f881953db33f5aa9362de77ab635979b1e4b3b.zip |
Merge pull request #2388 from nickvergessen/ticket/12480
[ticket/12480] Only load config/routing.yml from extensions route
* nickvergessen/ticket/12480:
[ticket/12480] Remove unused use statements
[ticket/12480] Add subfolder/config/routing.yml which should not be found
[ticket/12480] Only load config/routing.yml from extensions route
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r-- | phpBB/phpbb/controller/provider.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php index 9df8130210..2c7493f64c 100644 --- a/phpBB/phpbb/controller/provider.php +++ b/phpBB/phpbb/controller/provider.php @@ -46,7 +46,7 @@ class provider // We hardcode the path to the core config directory // because the finder cannot find it $this->routing_files = array_merge($this->routing_files, array('config/routing.yml'), array_keys($finder - ->directory('config') + ->directory('/config') ->suffix('routing.yml') ->find() )); |