From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 4 Oct 2011 11:07:47 +0000 (+0000)
Subject: remove hard-coded '.rxml' from ApplicationController 'render_feed' (#6317)
X-Git-Tag: 1.3.0~408
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2a27cc41f05667159e8972e117d7d18089bba560;p=redmine.git

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
---

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