diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-12-21 22:50:39 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-12-21 22:50:39 +0100 |
| commit | c298c9d6d0021931d08a3a189711117730b25278 (patch) | |
| tree | 7ac4bb55ba4817e829bfeca92421193b352471da /phpBB/includes | |
| parent | ea3d755962a3bad02ab71fb7e4313352fe52ac3c (diff) | |
| parent | cdbb609c2002cc5db5953bc89d46696aa9bdd069 (diff) | |
| download | forums-c298c9d6d0021931d08a3a189711117730b25278.tar forums-c298c9d6d0021931d08a3a189711117730b25278.tar.gz forums-c298c9d6d0021931d08a3a189711117730b25278.tar.bz2 forums-c298c9d6d0021931d08a3a189711117730b25278.tar.xz forums-c298c9d6d0021931d08a3a189711117730b25278.zip | |
Merge branch 'ticket/igorw/9937' into develop-olympus
* ticket/igorw/9937:
[ticket/9937] Make sure feed icon only shows for FORUM_POST
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_display.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 7989b74c55..acaef49fe8 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -456,7 +456,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod 'S_LOCKED_FORUM' => ($row['forum_status'] == ITEM_LOCKED) ? true : false, 'S_LIST_SUBFORUMS' => ($row['display_subforum_list']) ? true : false, 'S_SUBFORUMS' => (sizeof($subforums_list)) ? true : false, - 'S_FEED_ENABLED' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options']) && $row['forum_type'] != FORUM_LINK) ? true : false, + 'S_FEED_ENABLED' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options']) && $row['forum_type'] == FORUM_POST) ? true : false, 'FORUM_ID' => $row['forum_id'], 'FORUM_NAME' => $row['forum_name'], |