diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-12-27 03:43:22 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-12-27 03:43:22 +0530 |
| commit | 99d312da2ac8a8b6d9d3ba7ff45cd7b59af00c85 (patch) | |
| tree | 68f578ec4c62f2db32079f4cce3ff134ea971f67 /phpBB/config | |
| parent | 657ddf8309ab86bd0db84e4fdddfe2b73f542d4b (diff) | |
| parent | 1aa27f400cc6ece19775c5851c2e86db1a657df8 (diff) | |
| download | forums-99d312da2ac8a8b6d9d3ba7ff45cd7b59af00c85.tar forums-99d312da2ac8a8b6d9d3ba7ff45cd7b59af00c85.tar.gz forums-99d312da2ac8a8b6d9d3ba7ff45cd7b59af00c85.tar.bz2 forums-99d312da2ac8a8b6d9d3ba7ff45cd7b59af00c85.tar.xz forums-99d312da2ac8a8b6d9d3ba7ff45cd7b59af00c85.zip | |
Merge branch 'ticket/11271' into ticket/11271-develop
* ticket/11271:
[ticket/11271] Make path conversion more precise
Conflicts:
phpBB/feed.php
Diffstat (limited to 'phpBB/config')
| -rw-r--r-- | phpBB/config/feed.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/config/feed.yml b/phpBB/config/feed.yml index 7712a832f3..48bd9fe76f 100644 --- a/phpBB/config/feed.yml +++ b/phpBB/config/feed.yml @@ -5,6 +5,7 @@ services: - @config - @user - %core.root_path% + - %core.php_ext% feed.factory: class: phpbb\feed\factory |