From: Tom Hughes <tom@compton.nu>
Date: Thu, 30 Jul 2009 11:25:33 +0000 (+0000)
Subject: Fix the changeset feed to put the description in as raw HTML so we
X-Git-Tag: live~6819
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4afacf34109cc2f4938b331fd83a5eeb8435b2a1

Fix the changeset feed to put the description in as raw HTML so we
can include links instead of having to create a separate link free
version of it.
---

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index f02718cc9..c02ced7c2 100644
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -278,8 +278,6 @@ class ChangesetController < ApplicationController
       bbox = params[:minlon] + ',' + params[:minlat] + ',' + params[:maxlon] + ',' + params[:maxlat]
     end
 
-    user_link = bbox_link = nil
-
     if bbox
       conditions = cond_merge conditions, conditions_bbox(bbox)
       bbox = BoundingBox.from_s(bbox)
@@ -294,22 +292,18 @@ class ChangesetController < ApplicationController
       @title =  t 'changeset.list.title_user_bbox', :user => user.display_name, :bbox => bbox.to_s
       @heading =  t 'changeset.list.heading_user_bbox', :user => user.display_name, :bbox => bbox.to_s
       @description = t 'changeset.list.description_user_bbox', :user => user_link, :bbox => bbox_link
-      @description_plain = t 'changeset.list.description_user_bbox', :user => user.display_name, :bbox => bbox.to_s
     elsif user
       @title =  t 'changeset.list.title_user', :user => user.display_name
       @heading =  t 'changeset.list.heading_user', :user => user.display_name
       @description = t 'changeset.list.description_user', :user => user_link
-      @description_plain = t 'changeset.list.description_user', :user => user.display_name
     elsif bbox
       @title =  t 'changeset.list.title_bbox', :bbox => bbox.to_s
       @heading =  t 'changeset.list.heading_bbox', :bbox => bbox.to_s
       @description = t 'changeset.list.description_bbox', :bbox => bbox_link
-      @description_plain = t 'changeset.list.description_bbox', :bbox => bbox.to_s
     else
       @title =  t 'changeset.list.title'
       @heading =  t 'changeset.list.heading'
       @description = t 'changeset.list.description'
-      @description_plain = @description
     end
 
     @edit_pages, @edits = paginate(:changesets,
diff --git a/app/views/changeset/list.atom.builder b/app/views/changeset/list.atom.builder
index 648243fa8..db53cdb08 100644
--- a/app/views/changeset/list.atom.builder
+++ b/app/views/changeset/list.atom.builder
@@ -5,7 +5,9 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
   feed.title @title
 
   feed.subtitle :type => 'xhtml' do |xhtml|
-    xhtml.p @description_plain
+    xhtml.p do |p|
+      p << @description
+    end
   end
 
   feed.updated @edits.map {|e|  [e.created_at, e.closed_at].max }.max