From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Thu, 27 Jul 2017 13:13:49 +0000 (+0900)
Subject: Fallback to site_hostname when site_title is empty (#4394)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=bb96ba13cf78c0bee1919c32e61bf0644c89a209;p=mastodon.git

Fallback to site_hostname when site_title is empty (#4394)
---

diff --git a/app/helpers/instance_helper.rb b/app/helpers/instance_helper.rb
index a1c3c3521..70027cca9 100644
--- a/app/helpers/instance_helper.rb
+++ b/app/helpers/instance_helper.rb
@@ -2,7 +2,7 @@
 
 module InstanceHelper
   def site_title
-    Setting.site_title.to_s
+    Setting.site_title.presence || site_hostname
   end
 
   def site_hostname
diff --git a/spec/helpers/instance_helper_spec.rb b/spec/helpers/instance_helper_spec.rb
index c3d28544f..bc5950d91 100644
--- a/spec/helpers/instance_helper_spec.rb
+++ b/spec/helpers/instance_helper_spec.rb
@@ -19,7 +19,7 @@ describe InstanceHelper do
     it 'returns empty string when Setting.site_title is nil' do
       Setting.site_title = nil
 
-      expect(helper.site_title).to eq ''
+      expect(helper.site_title).to eq 'cb6e6126.ngrok.io'
     end
   end