Merge branch 'master' into openstreetbugs

[rails.git] / app / views / changeset / list.atom.builder

diff --git a/app/views/changeset/list.atom.builder b/app/views/changeset/list.atom.builder
index 1fbfe8c5601609ad9db2d47bb27ef8ebe2d9677a..d9d53593c2dd8f047c25999e2eb1e7338c5d30d7 100644 (file)
--- a/app/views/changeset/list.atom.builder
+++ b/app/views/changeset/list.atom.builder
@@ -30,7 +30,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
                  :type => "application/osmChange+xml"
 
       if !changeset.tags.empty? and changeset.tags.has_key? "comment"
-        entry.title t('browse.changeset.feed.title_comment', :id => h(changeset.id), :comment => h(changeset.tags['comment']))
+        entry.title t('browse.changeset.feed.title_comment', :id => h(changeset.id), :comment => h(changeset.tags['comment'])), :type => "html"
       else
         entry.title t('browse.changeset.feed.title', :id => h(changeset.id))
       end
@@ -68,7 +68,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
                 td.table :cellpadding => "0" do |table|
                   changeset.tags.sort.each do |tag|
                     table.tr do |tr|
-                      tr.td "#{h(tag[0])} = #{sanitize(auto_link(tag[1]))}"
+                      tr.td << "#{h(tag[0])} = #{auto_link(h(tag[1]))}"
                     end
                   end
                 end