diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-20 12:19:48 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-20 12:19:48 +0000 |
| commit | 38fcaaf1d2781d78aab5c3c25f212ac757c277f4 (patch) | |
| tree | 20cc600b4d1d720edaf3e13701e9e088b988bbd0 /phpBB | |
| parent | 9666983c694bc05cec4731fefc74908ff90b8aef (diff) | |
| download | forums-38fcaaf1d2781d78aab5c3c25f212ac757c277f4.tar forums-38fcaaf1d2781d78aab5c3c25f212ac757c277f4.tar.gz forums-38fcaaf1d2781d78aab5c3c25f212ac757c277f4.tar.bz2 forums-38fcaaf1d2781d78aab5c3c25f212ac757c277f4.tar.xz forums-38fcaaf1d2781d78aab5c3c25f212ac757c277f4.zip | |
instead of only enabling forum feeds in viewforum we set it on every location where forums are shown
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10029 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_display.php | 8 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 225603a8b3..2f385ff5ba 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -545,7 +545,7 @@ function generate_forum_rules(&$forum_data) */ function generate_forum_nav(&$forum_data) { - global $db, $user, $template, $auth; + global $db, $user, $template, $auth, $config; global $phpEx, $phpbb_root_path; if (!$auth->acl_get('f_list', $forum_data['forum_id'])) @@ -592,8 +592,10 @@ function generate_forum_nav(&$forum_data) $template->assign_vars(array( 'FORUM_ID' => $forum_data['forum_id'], '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'])) - ); + '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, + )); return; } diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 09bbd84c4f..b60eaa34e1 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -310,7 +310,6 @@ $template->assign_vars(array( 'S_SINGLE_MODERATOR' => (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true, 'S_IS_LOCKED' => ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false, 'S_VIEWFORUM' => true, - 'S_ENABLE_FEEDS_FORUM' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $forum_data['forum_options'])) ? true : false, 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&i=main&mode=forum_view", true, $user->session_id) : '', 'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=post&f=' . $forum_id) : '', |