diff options
| author | David King <imkingdavid@gmail.com> | 2013-07-13 14:06:43 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-07-13 14:06:43 -0400 |
| commit | dfe0f6b1439ba13d433a2290a10450405428d3ef (patch) | |
| tree | 9339f82c28cf3dd3495fdbe7f8e8a184d9974fd7 /phpBB/includes/feed/base.php | |
| parent | 3be753cd5c64b80569f9c1189b39e8e47c248d89 (diff) | |
| parent | 9d86385a362868bcd82901e1c7df18ba80eda945 (diff) | |
| download | forums-dfe0f6b1439ba13d433a2290a10450405428d3ef.tar forums-dfe0f6b1439ba13d433a2290a10450405428d3ef.tar.gz forums-dfe0f6b1439ba13d433a2290a10450405428d3ef.tar.bz2 forums-dfe0f6b1439ba13d433a2290a10450405428d3ef.tar.xz forums-dfe0f6b1439ba13d433a2290a10450405428d3ef.zip | |
Merge branch 'develop' into ticket/11215
* develop: (214 commits)
[ticket/10999] Fix assets_version in ACP
[prep-release-3.0.12] More changelog items for the 3.0.12 release.
[ticket/11687] Add assets_version to phpbb_config
[ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
[ticket/11674] Do not include vendor folder if there are no dependencies.
[ticket/11685] Remove logout confirmation page
[ticket/11684] Remove useless confirmation page after login and admin login
[ticket/9657] Define user before injecting
[ticket/9657] Remove old code
[ticket/9657] Keep approval state of posts/topics when copying them
[ticket/9657] Add functional tests for forking a copy
[ticket/9657] Add functional test for splitting topic
[ticket/11112] Do not change opensource.org link to https
[ticket/9657] Add functional test for restoring a post/topic
[ticket/11112] Use https for user-visible links to phpbb.com
[ticket/9657] Fix a little error when moving softdeleted topics
[ticket/9657] Add unit tests for softdeleting and moving posts/topics
[ticket/9657] Remove last references to m_restore permission
[ticket/9657] Fix english language :(
[ticket/9657] Notifications do not require emails or jabber anymore
...
Diffstat (limited to 'phpBB/includes/feed/base.php')
| -rw-r--r-- | phpBB/includes/feed/base.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/feed/base.php b/phpBB/includes/feed/base.php index af28ee8dc8..296d830932 100644 --- a/phpBB/includes/feed/base.php +++ b/phpBB/includes/feed/base.php @@ -80,10 +80,11 @@ abstract class phpbb_feed_base * @param phpbb_cache_driver_interface $cache Cache object * @param phpbb_user $user User object * @param phpbb_auth $auth Auth object + * @param phpbb_content_visibility $content_visibility Auth object * @param string $phpEx php file extension * @return null */ - function __construct(phpbb_feed_helper $helper, phpbb_config $config, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, phpbb_user $user, phpbb_auth $auth, $phpEx) + function __construct(phpbb_feed_helper $helper, phpbb_config $config, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, phpbb_user $user, phpbb_auth $auth, phpbb_content_visibility $content_visibility, $phpEx) { $this->config = $config; $this->helper = $helper; @@ -91,6 +92,7 @@ abstract class phpbb_feed_base $this->cache = $cache; $this->user = $user; $this->auth = $auth; + $this->content_visibility = $content_visibility; $this->phpEx = $phpEx; $this->set_keys(); |