From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 26 Apr 2009 20:12:58 +0000 (+0000)
Subject: Fixes self and alternate atom links (#3161).
X-Git-Tag: 0.9.0~499
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d984422a1fc6d68d88161e7f0d35d3d5b9277fe9;p=redmine.git

Fixes self and alternate atom links (#3161).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2697 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml
index 811140152..d5fec75d2 100644
--- a/app/views/common/feed.atom.rxml
+++ b/app/views/common/feed.atom.rxml
@@ -1,8 +1,8 @@
 xml.instruct!
 xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
   xml.title   truncate_single_line(@title, :length => 100)
-  xml.link    "rel" => "self", "href" => url_for(params.merge({:format => nil, :only_path => false}))
-  xml.link    "rel" => "alternate", "href" => url_for(:controller => 'welcome', :only_path => false)
+  xml.link    "rel" => "self", "href" => url_for(params.merge(:only_path => false))
+  xml.link    "rel" => "alternate", "href" => url_for(params.merge(:only_path => false, :format => nil, :key => nil))
   xml.id      url_for(:controller => 'welcome', :only_path => false)
   xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema)
   xml.author  { xml.name "#{Setting.app_title}" }