diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-12-21 20:59:52 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-12-21 20:59:52 +0100 |
| commit | ea3d755962a3bad02ab71fb7e4313352fe52ac3c (patch) | |
| tree | f0562fd753af38e7c061d5e7f82c09380cddad35 /phpBB/includes/functions_display.php | |
| parent | c1d6aceb030c97c5e3c0f8bc68c4abbe4b0dc961 (diff) | |
| parent | 3f27cb2ea78dd571591db6d0886395f313c9fe5e (diff) | |
| download | forums-ea3d755962a3bad02ab71fb7e4313352fe52ac3c.tar forums-ea3d755962a3bad02ab71fb7e4313352fe52ac3c.tar.gz forums-ea3d755962a3bad02ab71fb7e4313352fe52ac3c.tar.bz2 forums-ea3d755962a3bad02ab71fb7e4313352fe52ac3c.tar.xz forums-ea3d755962a3bad02ab71fb7e4313352fe52ac3c.zip | |
Merge branch 'ticket/rmcgirr83/9937' into develop-olympus
* ticket/rmcgirr83/9937:
[ticket/9937] The feed icon displays on External links...which we don't want
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -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 2de7e1b169..7989b74c55 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'])) ? true : false, + 'S_FEED_ENABLED' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options']) && $row['forum_type'] != FORUM_LINK) ? true : false, 'FORUM_ID' => $row['forum_id'], 'FORUM_NAME' => $row['forum_name'], |