From: Eugen <eugen@zeonfederated.com>
Date: Sun, 16 Apr 2017 00:40:36 +0000 (+0200)
Subject: Fix #1852 - Ensure feeds have valid <title> tags (#1875)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=95bcbaa4340fe54954c2f15300cbc585d4468c8d;p=mastodon.git

Fix #1852 - Ensure feeds have valid <title> tags (#1875)
---

diff --git a/app/lib/atom_serializer.rb b/app/lib/atom_serializer.rb
index 69e1f153c..180b9bb82 100644
--- a/app/lib/atom_serializer.rb
+++ b/app/lib/atom_serializer.rb
@@ -39,7 +39,7 @@ class AtomSerializer
     add_namespaces(feed)
 
     append_element(feed, 'id', account_url(account, format: 'atom'))
-    append_element(feed, 'title', account.display_name)
+    append_element(feed, 'title', account.display_name.presence || account.username)
     append_element(feed, 'subtitle', account.note)
     append_element(feed, 'updated', account.updated_at.iso8601)
     append_element(feed, 'logo', full_asset_url(account.avatar.url(:original)))