From 4e4915252971aa3270044ce793d9e5af2417df67 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 17 Dec 2009 00:41:30 +0000 Subject: [PATCH] Use correct limit config parameter in the News feed. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10346 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/feed.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 2ec3d85f36..55494f90d6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -120,6 +120,7 @@
  • [Fix] Handle export of private messages where all recipients were deleted. (Bug #50985)
  • [Fix] Correctly get unread status information for global announcements in search results.
  • [Fix] Correctly handle global announcements in ATOM feeds.
    • +
  • [Fix] Use correct limit config parameter in the News feed.
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • diff --git a/phpBB/feed.php b/phpBB/feed.php index 0393a55037..5043c89572 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -982,7 +982,7 @@ class phpbb_feed_news extends phpbb_feed_base $this->set('enable_smilies', 'enable_smilies'); $this->set('enable_magic_url', 'enable_magic_url'); - $this->num_items = (int) $config['feed_overall_forums_limit']; + $this->num_items = (int) $config['feed_limit']; } function get_sql()