From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 30 Mar 2008 08:33:04 +0000 (+0000)
Subject: Fixed: Feed content limit setting has no effect (closes #954).
X-Git-Tag: 0.8.0-RC1~622
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=faf1f1e812b385dcf88591eac6fc898f86947c75;p=redmine.git

Fixed: Feed content limit setting has no effect (closes #954).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1310 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 98cb4a827..abf621641 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -150,6 +150,7 @@ class ApplicationController < ActionController::Base
   def render_feed(items, options={})    
     @items = items || []
     @items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
+    @items = @items.slice(0, Setting.feeds_limit.to_i)
     @title = options[:title] || Setting.app_title
     render :template => "common/feed.atom.rxml", :layout => false, :content_type => 'application/atom+xml'
   end