Revert r20455 (#10535).

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

diff --git a/app/views/common/feed.atom.builder b/app/views/common/feed.atom.builder
index 0fbe1063c4beff5989fd5149a760c647115797e1..ddf5122561e77a0b2ab423f45f02a89fb1e8fc95 100644 (file)
--- a/app/views/common/feed.atom.builder
+++ b/app/views/common/feed.atom.builder
@@ -4,30 +4,9 @@ protocol = Setting.protocol
 host = Setting.host_name
 xml.instruct!
 xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
-  xml.title truncate_single_line_raw(@title, 100)
-  xml.link(
-    "rel" => "self",
-    "href" =>
-      url_for(
-        :params => request.query_parameters,
-        :only_path => false, :format => 'atom',
-        :protocol => protocol, :host => host
-      )
-  )
-  xml.link(
-    "rel" => "alternate",
-    "href" =>
-      url_for(
-        :params =>
-          request.query_parameters.merge(
-            :format => nil,
-            :key => nil
-          ),
-        :only_path => false,
-        :protocol => protocol,
-        :host => host
-      )
-  )
+  xml.title   truncate_single_line_raw(@title, 100)
+  xml.link    "rel" => "self", "href" => url_for(:params => request.query_parameters, :only_path => false, :format => 'atom', :protocol => protocol, :host => host)
+  xml.link    "rel" => "alternate", "href" => url_for(:params => request.query_parameters.merge(:format => nil, :key => nil), :only_path => false, :protocol => protocol, :host => host)
   xml.id      home_url
   xml.icon    favicon_url
   xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema)