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

makeable · Jul 27, 2017 · bb96ba1 · bb96ba1
1 parent 5bf4838
commit bb96ba1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -19,7 +19,7 @@
  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