aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-12-23 02:30:37 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-12-23 02:30:37 +0000
commita4cee51de51bfbdfe4af52ac00d9fa62857d6a92 (patch)
tree20963bab0396b5b2f69bb460ed5205ab511989a2 /phpBB/feed.php
parentJust a little reminder for when we decide to update the confusables one day (diff)
downloadphpbb-a4cee51de51bfbdfe4af52ac00d9fa62857d6a92.tar.gz
phpbb-a4cee51de51bfbdfe4af52ac00d9fa62857d6a92.tar.bz2
phpbb-a4cee51de51bfbdfe4af52ac00d9fa62857d6a92.zip
Split feed_limit into feed_limit_post and feed_limit_topic. Drop feed_overall_topics_limit.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10366 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/feed.php')
-rw-r--r--phpBB/feed.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php
index f7349a21cf..f2d823de99 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -610,7 +610,7 @@ class phpbb_feed_base
*/
class phpbb_feed_post_base extends phpbb_feed_base
{
- var $num_items = 'feed_limit';
+ var $num_items = 'feed_limit_post';
function set_keys()
{
@@ -651,6 +651,8 @@ class phpbb_feed_post_base extends phpbb_feed_base
*/
class phpbb_feed_topic_base extends phpbb_feed_base
{
+ var $num_items = 'feed_limit_topic';
+
function set_keys()
{
$this->set('title', 'topic_title');
@@ -1114,8 +1116,6 @@ class phpbb_feed_forums extends phpbb_feed_base
*/
class phpbb_feed_news extends phpbb_feed_topic_base
{
- var $num_items = 'feed_limit';
-
function get_news_forums()
{
global $db, $cache;
@@ -1197,8 +1197,6 @@ class phpbb_feed_news extends phpbb_feed_topic_base
*/
class phpbb_feed_topics extends phpbb_feed_topic_base
{
- var $num_items = 'feed_overall_topics_limit';
-
function get_sql()
{
global $db, $config;