diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-12-07 13:32:19 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-12-07 13:32:19 +0100 |
| commit | 47ea6bc9e61c71f6d54df848b6c61ace052d9e2a (patch) | |
| tree | 9a4181d1c3c2d045abc1575634480d2ab5b1a634 /phpBB/phpbb/di/extension | |
| parent | f32a30eecacba212850a11b7b4740d0a69bd49de (diff) | |
| parent | 71169de8230812f2d05b87bfba42331e04663b81 (diff) | |
| download | forums-47ea6bc9e61c71f6d54df848b6c61ace052d9e2a.tar forums-47ea6bc9e61c71f6d54df848b6c61ace052d9e2a.tar.gz forums-47ea6bc9e61c71f6d54df848b6c61ace052d9e2a.tar.bz2 forums-47ea6bc9e61c71f6d54df848b6c61ace052d9e2a.tar.xz forums-47ea6bc9e61c71f6d54df848b6c61ace052d9e2a.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb into ticket/11997
Conflicts:
tests/functional/fixtures/ext/foo/bar/config/services.yml
Diffstat (limited to 'phpBB/phpbb/di/extension')
| -rw-r--r-- | phpBB/phpbb/di/extension/config.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php index 5fcb2d6f10..2603e7b358 100644 --- a/phpBB/phpbb/di/extension/config.php +++ b/phpBB/phpbb/di/extension/config.php @@ -70,7 +70,7 @@ class config extends Extension { if (preg_match('#^[a-z]+$#', $acm_type)) { - return '\\phpbb\cache\driver\\'.$acm_type; + return 'phpbb\\cache\\driver\\' . $acm_type; } return $acm_type; |