aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_display.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-01-12 21:15:32 +0000
committerAndreas Fischer <bantu@phpbb.com>2010-01-12 21:15:32 +0000
commit0f5856ce5b4b41572c4a819865b339e8137eeae1 (patch)
tree47ec990bf8b254e1d06343dab3ad92f6f347d3c8 /phpBB/includes/functions_display.php
parent7462724a2488881e50006ce8815bebbd71ff5618 (diff)
downloadforums-0f5856ce5b4b41572c4a819865b339e8137eeae1.tar
forums-0f5856ce5b4b41572c4a819865b339e8137eeae1.tar.gz
forums-0f5856ce5b4b41572c4a819865b339e8137eeae1.tar.bz2
forums-0f5856ce5b4b41572c4a819865b339e8137eeae1.tar.xz
forums-0f5856ce5b4b41572c4a819865b339e8137eeae1.zip
No longer include subforums in forum feed.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10405 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
-rw-r--r--phpBB/includes/functions_display.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 58cbdaef5b..f49aa42324 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -594,7 +594,7 @@ function generate_forum_nav(&$forum_data)
'FORUM_NAME' => $forum_data['forum_name'],
'FORUM_DESC' => generate_text_for_display($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options']),
- 'S_ENABLE_FEEDS_FORUM' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $forum_data['forum_options'])) ? true : false,
+ 'S_ENABLE_FEEDS_FORUM' => ($config['feed_forum'] && $forum_data['forum_type'] == FORUM_POST && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $forum_data['forum_options'])) ? true : false,
));
return;