Fallback to site_hostname when site_title is empty (#4394)

2017-07-27 22:13:49 +09:00 · 2017-07-27 22:13:49 +09:00 · bb96ba13cf
parent 5bf4838e2f
commit bb96ba13cf
2 changed files with 2 additions and 2 deletions
--- 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
--- 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