diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-12-22 19:21:41 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-12-22 19:21:41 +0000 |
| commit | d0c596a5eaab7439a3b32af8b9a14c12f9ae18e2 (patch) | |
| tree | 3790bdb45ffb7bc2d020511951ac224c93acdffb /phpBB/includes | |
| parent | bc0cc313dfc2fc175f51af8d84f3ee21d0873dee (diff) | |
| download | forums-d0c596a5eaab7439a3b32af8b9a14c12f9ae18e2.tar forums-d0c596a5eaab7439a3b32af8b9a14c12f9ae18e2.tar.gz forums-d0c596a5eaab7439a3b32af8b9a14c12f9ae18e2.tar.bz2 forums-d0c596a5eaab7439a3b32af8b9a14c12f9ae18e2.tar.xz forums-d0c596a5eaab7439a3b32af8b9a14c12f9ae18e2.zip | |
Add ability to disable overall (aka board-wide) feed.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10363 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 534fa1059b..6b6b59f88b 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -271,6 +271,7 @@ class acp_board 'feed_overall_forums' => array('lang' => 'ACP_FEED_OVERALL_FORUMS', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ), 'feed_overall_topics' => array('lang' => 'ACP_FEED_OVERALL_TOPIC', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ), 'feed_overall_topics_limit' => array('lang' => 'ACP_FEED_OVERALL_TOPIC_LIMIT', 'validate' => 'int:5', 'type' => 'text:3:4', 'explain' => false), + 'feed_overall' => array('lang' => 'ACP_FEED_OVERALL', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ), 'feed_forum' => array('lang' => 'ACP_FEED_FORUM', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ), 'feed_topic' => array('lang' => 'ACP_FEED_TOPIC', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ), 'feed_news_id' => array('lang' => 'ACP_FEED_NEWS', 'validate' => 'string', 'type' => 'custom', 'method' => 'select_news_forums', 'explain' => true), diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 396267432a..6b26b5aa7b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4139,6 +4139,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'S_LOGIN_REDIRECT' => build_hidden_fields(array('redirect' => str_replace('&', '&', build_url()))), 'S_ENABLE_FEEDS' => ($config['feed_enable']) ? true : false, + 'S_ENABLE_FEEDS_OVERALL' => ($config['feed_overall']) ? true : false, 'S_ENABLE_FEEDS_FORUMS' => ($config['feed_overall_forums']) ? true : false, 'S_ENABLE_FEEDS_TOPICS' => ($config['feed_overall_topics']) ? true : false, 'S_ENABLE_FEEDS_NEWS' => ($s_feed_news) ? true : false, |