summaryrefslogtreecommitdiffstats
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-10-04 11:07:47 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-10-04 11:07:47 +0000
commit2a27cc41f05667159e8972e117d7d18089bba560 (patch)
tree5a82f4fffe554175981fe332bf5fab8cfb77b239 /app/controllers/application_controller.rb
parent986f0acb00f34e720c48de67060c2479a63c94f3 (diff)
downloadredmine-2a27cc41f05667159e8972e117d7d18089bba560.tar.gz
redmine-2a27cc41f05667159e8972e117d7d18089bba560.zip
remove hard-coded '.rxml' from ApplicationController 'render_feed' (#6317)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7573 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 260bf1f0e..bf05db034 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -334,7 +334,8 @@ class ApplicationController < ActionController::Base
@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'
+ render :template => "common/feed.atom", :layout => false,
+ :content_type => 'application/atom+xml'
end
# TODO: remove in Redmine 1.4