diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-12-27 00:48:52 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-12-27 00:48:52 +0000 |
| commit | ad7e3ccf4c8d233744cd7408f42484405f7d9c48 (patch) | |
| tree | a814f853010b99776f35845a148513359aa7189e /phpBB/includes | |
| parent | d7261a5425fab26a4ac5b39697fe2c987cb5e066 (diff) | |
| download | forums-ad7e3ccf4c8d233744cd7408f42484405f7d9c48.tar forums-ad7e3ccf4c8d233744cd7408f42484405f7d9c48.tar.gz forums-ad7e3ccf4c8d233744cd7408f42484405f7d9c48.tar.bz2 forums-ad7e3ccf4c8d233744cd7408f42484405f7d9c48.tar.xz forums-ad7e3ccf4c8d233744cd7408f42484405f7d9c48.zip | |
Integrate active topics feed. Some language adjustments and rearrangements.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10382 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index f1b0b5bb29..f243699079 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -276,7 +276,8 @@ class acp_board 'legend3' => 'ACP_FEED_TOPIC_BASED', 'feed_limit_topic' => array('lang' => 'ACP_FEED_LIMIT', 'validate' => 'int:5', 'type' => 'text:3:4', 'explain' => true), - 'feed_overall_topics' => array('lang' => 'ACP_FEED_OVERALL_TOPIC', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ), + 'feed_topics_new' => array('lang' => 'ACP_FEED_TOPICS_NEW', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ), + 'feed_topics_active' => array('lang' => 'ACP_FEED_TOPICS_ACTIVE', '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), 'legend4' => 'ACP_FEED_SETTINGS_OTHER', diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 6b26b5aa7b..9c294c81af 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4141,7 +4141,8 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 '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_TOPICS' => ($config['feed_topics_new']) ? true : false, + 'S_ENABLE_FEEDS_TOPICS_ACTIVE' => ($config['feed_topics_active']) ? true : false, 'S_ENABLE_FEEDS_NEWS' => ($s_feed_news) ? true : false, 'T_THEME_PATH' => "{$web_path}styles/" . $user->theme['theme_path'] . '/theme', |