From: Tom Hughes <tom@compton.nu>
Date: Sat, 29 Oct 2016 17:08:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1349'
X-Git-Tag: live~4723
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/48eb8eb3690851f7f26afc68e1524341fcb6c187?hp=-c

Merge remote-tracking branch 'openstreetmap/pull/1349'
---

48eb8eb3690851f7f26afc68e1524341fcb6c187
diff --combined app/views/diary_entry/rss.rss.builder
index 5e1dee762,6ccd21438..d9cc40797
--- a/app/views/diary_entry/rss.rss.builder
+++ b/app/views/diary_entry/rss.rss.builder
@@@ -9,7 -9,7 +9,7 @@@ xml.rss("version" => "2.0"
      xml.link url_for(:action => "list", :host => SERVER_URL)
      xml.image do
        xml.url image_path("mag_map-rss2.0.png")
-       xml.title "OpenStreetMap"
+       xml.title @title
        xml.width "100"
        xml.height "100"
        xml.link url_for(:action => "list", :host => SERVER_URL)
@@@ -17,11 -17,11 +17,11 @@@
  
      @entries.each do |entry|
        xml.item do
 -        xml.title h(entry.title)
 +        xml.title entry.title
          xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL)
          xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL)
          xml.description entry.body.to_html
-         xml.author entry.user.display_name
+         xml.dc :creator, entry.user.display_name
          xml.pubDate entry.created_at.to_s(:rfc822)
          xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :host => SERVER_URL)