mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 10:16:36 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
Conflicts:
	phpBB/config/feed.yml
	phpBB/feed.php
	phpBB/phpbb/feed/base.php
This commit is contained in:
Marc Alexander
2016-07-17 22:09:53 +02:00
parent 4e480d46f5 befacabf7e
commit e7ce7ecbe7
3 changed files with 65 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/config/default/container/services_feed.yml
View File

@@ -11,6 +11,7 @@ services:
- '@feed.helper'
- '@user'
- '@auth'
- '@dispatcher'
- '%core.php_ext%'
feed.helper:
@@ -32,6 +33,7 @@ services:
- '@user'
- '@auth'
- '@content.visibility'
- '@dispatcher'
- '%core.php_ext%'
feed.forums:
@@ -45,6 +47,7 @@ services:
- '@user'
- '@auth'
- '@content.visibility'
- '@dispatcher'
- '%core.php_ext%'
feed.news:
@@ -58,6 +61,7 @@ services:
- '@user'
- '@auth'
- '@content.visibility'
- '@dispatcher'
- '%core.php_ext%'
feed.overall:
@@ -71,6 +75,7 @@ services:
- '@user'
- '@auth'
- '@content.visibility'
- '@dispatcher'
- '%core.php_ext%'
feed.topic:
@@ -84,6 +89,7 @@ services:
- '@user'
- '@auth'
- '@content.visibility'
- '@dispatcher'
- '%core.php_ext%'
feed.topics:
@@ -97,6 +103,7 @@ services:
- '@user'
- '@auth'
- '@content.visibility'
- '@dispatcher'
- '%core.php_ext%'
feed.topics_active:
@@ -110,4 +117,5 @@ services:
- '@user'
- '@auth'
- '@content.visibility'
- '@dispatcher'
- '%core.php_ext%'