Merge branch 'master' into notes

[rails.git] / app / views / notes / _note.rss.builder

diff --git a/app/views/notes/_note.rss.builder b/app/views/notes/_note.rss.builder
index cffc3f271c2d75ddde6adaf070aebdffae15825c..fbd217beb75f94e1b9801ef724cac75aadb675fc 100644 (file)
--- a/app/views/notes/_note.rss.builder
+++ b/app/views/notes/_note.rss.builder
@@ -12,7 +12,11 @@ xml.item do
   xml.link browse_note_url(note)
   xml.guid note_url(note)
   xml.description render(:partial => "description", :object => note, :formats => [ :html ])
-  xml.author note.comments.first.author_name
+
+  if note.author
+    xml.author note.author_display_name
+  end
+
   xml.pubDate note.updated_at.to_s(:rfc822)
   xml.geo :lat, note.lat
   xml.geo :long, note.lon