From 3d566279cb84aba6d07eaadebda6c059f2a58657 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 10 Sep 2016 19:18:17 +0200
Subject: [PATCH] Fix formatter return block

---
 app/lib/formatter.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 12b141e7e7..ad0f022a75 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -37,8 +37,7 @@ class Formatter
       acct    = Account::MENTION_RE.match(match)[1]
       mention = mentions.find { |mention| mention.account.acct.eql?(acct) }
 
-      return match if mention.nil?
-      mention_html(match, mention.account)
+      mention.nil? ? match : mention_html(match, mention.account)
     end
   end