diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-12-17 00:41:30 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-12-17 00:41:30 +0000 |
| commit | 4e4915252971aa3270044ce793d9e5af2417df67 (patch) | |
| tree | 933dfb34d192719f9820e392b0a8fa0cf446e873 /phpBB | |
| parent | 69c07b83302f477d6209812a612e2da6a6bf3101 (diff) | |
| download | forums-4e4915252971aa3270044ce793d9e5af2417df67.tar forums-4e4915252971aa3270044ce793d9e5af2417df67.tar.gz forums-4e4915252971aa3270044ce793d9e5af2417df67.tar.bz2 forums-4e4915252971aa3270044ce793d9e5af2417df67.tar.xz forums-4e4915252971aa3270044ce793d9e5af2417df67.zip | |
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
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/feed.php | 2 |
2 files changed, 2 insertions, 1 deletions
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 @@ <li>[Fix] Handle export of private messages where all recipients were deleted. (Bug #50985)</li> <li>[Fix] Correctly get unread status information for global announcements in search results.</li> <li>[Fix] Correctly handle global announcements in ATOM feeds.</li> + <li>[Fix] Use correct limit config parameter in the News feed.</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> 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() |