diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 46f2872f56..dd9faa84a9 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -132,8 +132,8 @@
[Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)
[Change] Alter ACP user quick tools interface to reduce confusion with the delete operation.
[Change] Remove item limit from "All forums" feed.
- [Change] "All topics" feed now returns newest board topics.
[Change] Send statistics now check for IPv6 and send private network status as a boolean.
+ [Change] Split "All topics" feed into "New Topics" and "Active Topics" feeds
1.ii. Changes since 3.0.5
diff --git a/phpBB/feed.php b/phpBB/feed.php
index 3a3cd988b6..4522f2f940 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -352,7 +352,8 @@ class phpbb_feed_factory
break;
case 'topics':
- if (!$config['feed_overall_topics'])
+ case 'topics_new':
+ if (!$config['feed_topics_new'])
{
return false;
}
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',
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 6da4ab3f76..41fd9a2136 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1580,6 +1580,8 @@ function change_database_data(&$no_updates, $version)
set_config('feed_overall', '1');
set_config('feed_limit_post', (string) (isset($config['feed_limit']) ? (int) $config['feed_limit'] : 15));
set_config('feed_limit_topic', (string) (isset($config['feed_overall_topics_limit']) ? (int) $config['feed_overall_topics_limit'] : 10));
+ set_config('feed_topics_new', (!empty($config['feed_overall_topics']) ? '1' : '0'));
+ set_config('feed_topics_active', (!empty($config['feed_overall_topics']) ? '1' : '0'));
break;
}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index e1aa34b5a8..2f3b60b7a0 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -102,10 +102,11 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_enable', '0')
INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_limit_post', '15');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_limit_topic', '10');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_overall_forums', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_overall_topics', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_overall', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_forum', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_topic', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_topics_new', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_topics_active', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_item_statistics', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval', '15');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('force_server_vars', '0');
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index f181ea0291..949aa6766c 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -249,31 +249,33 @@ $lang = array_merge($lang, array(
'ACP_FEED_MANAGEMENT' => 'General Syndication Feeds settings',
'ACP_FEED_MANAGEMENT_EXPLAIN' => 'This Module makes available various ATOM Feeds, parsing any BBCode in posts to make them readable in external feeds.',
- 'ACP_FEED_ENABLE' => 'Enable Feeds',
- 'ACP_FEED_ENABLE_EXPLAIN' => 'Turns on or off ATOM Feeds for the entire board.
Disabling this switches off all Feeds, no matter how the options below are set.',
- 'ACP_FEED_LIMIT' => 'Number of items',
- 'ACP_FEED_LIMIT_EXPLAIN' => 'The maximum number of feed items to display.',
-
- 'ACP_FEED_OVERALL' => 'Enable board-wide Feed',
- 'ACP_FEED_OVERALL_EXPLAIN' => 'Board-wide new posts.',
-
- 'ACP_FEED_OVERALL_FORUMS' => 'Enable forums feed',
- 'ACP_FEED_OVERALL_FORUMS_EXPLAIN' => 'Enables the “All forums” feed, which displays a list of forums.',
-
- 'ACP_FEED_OVERALL_TOPIC' => 'Enable topics feed',
- 'ACP_FEED_OVERALL_TOPIC_EXPLAIN' => 'Enables the “All Topics” feed, which displays the last created topics including the first post.',
- 'ACP_FEED_FORUM' => 'Enable Per-Forum Feeds',
- 'ACP_FEED_FORUM_EXPLAIN' => 'Single forum new posts.',
- 'ACP_FEED_TOPIC' => 'Enable Per-Topic Feeds',
- 'ACP_FEED_TOPIC_EXPLAIN' => 'Single topics new posts.',
- 'ACP_FEED_NEWS' => 'News Feeds',
- 'ACP_FEED_NEWS_EXPLAIN' => 'Pull the first post from these forums. Select no forums to disable news feed.
Select multiple forums by holding CTRL and clicking.',
-
'ACP_FEED_GENERAL' => 'General Feed Settings',
'ACP_FEED_POST_BASED' => 'Post-based Feed Settings',
'ACP_FEED_TOPIC_BASED' => 'Topic-based Feed Settings',
'ACP_FEED_SETTINGS_OTHER' => 'Other Feeds and Seetings',
+ 'ACP_FEED_ENABLE' => 'Enable Feeds',
+ 'ACP_FEED_ENABLE_EXPLAIN' => 'Turns on or off ATOM Feeds for the entire board.
Disabling this switches off all Feeds, no matter how the options below are set.',
+ 'ACP_FEED_LIMIT' => 'Number of items',
+ 'ACP_FEED_LIMIT_EXPLAIN' => 'The maximum number of feed items to display.',
+
+ 'ACP_FEED_OVERALL' => 'Enable board-wide Feed',
+ 'ACP_FEED_OVERALL_EXPLAIN' => 'Board-wide new posts.',
+ 'ACP_FEED_FORUM' => 'Enable Per-Forum Feeds',
+ 'ACP_FEED_FORUM_EXPLAIN' => 'Single forum new posts.',
+ 'ACP_FEED_TOPIC' => 'Enable Per-Topic Feeds',
+ 'ACP_FEED_TOPIC_EXPLAIN' => 'Single topics new posts.',
+
+ 'ACP_FEED_TOPICS_NEW' => 'Enable new topics feed',
+ 'ACP_FEED_TOPICS_NEW_EXPLAIN' => 'Enables the “New Topics” feed, which displays the last created topics including the first post.',
+ 'ACP_FEED_TOPICS_ACTIVE' => 'Enable active topics feed',
+ 'ACP_FEED_TOPICS_ACTIVE_EXPLAIN' => 'Enables the “Active Topics” feed, which displays the last active topics including the last post.',
+ 'ACP_FEED_NEWS' => 'News Feed',
+ 'ACP_FEED_NEWS_EXPLAIN' => 'Pull the first post from these forums. Select no forums to disable news feed.
Select multiple forums by holding CTRL and clicking.',
+
+ 'ACP_FEED_OVERALL_FORUMS' => 'Enable forums feed',
+ 'ACP_FEED_OVERALL_FORUMS_EXPLAIN' => 'Enables the “All forums” feed, which displays a list of forums.',
+
'ACP_FEED_ITEM_STATISTICS' => 'Item statistics',
'ACP_FEED_ITEM_STATISTICS_EXPLAIN' => 'Display individual statistics underneath feed items
(Posted by, date and time, Replies, Views)',
'ACP_FEED_EXCLUDE_ID' => 'Exclude these forums',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b97445f186..75aeb90855 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -491,6 +491,8 @@ $lang = array_merge($lang, array(
'RETURN_TO' => 'Return to',
'FEED' => 'Feed',
'FEED_NEWS' => 'News',
+ 'FEED_TOPICS_ACTIVE' => 'Active Topics',
+ 'FEED_TOPICS_NEW' => 'New Topics',
'RULES_ATTACH_CAN' => 'You can post attachments in this forum',
'RULES_ATTACH_CANNOT' => 'You cannot post attachments in this forum',
'RULES_DELETE_CAN' => 'You can delete your posts in this forum',
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index badadd8bc6..8f4ac19fb8 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -19,7 +19,8 @@
-
+
+
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index dceb87ce10..963f5160dd 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -19,7 +19,8 @@
-
+
+