Fallback to site_hostname when site_title is empty (#4394)
This commit is contained in:
		
				
					committed by
					
						
						Eugen Rochko
					
				
			
			
				
	
			
			
			
						parent
						
							5bf4838e2f
						
					
				
				
					commit
					bb96ba13cf
				
			@@ -2,7 +2,7 @@
 | 
			
		||||
 | 
			
		||||
module InstanceHelper
 | 
			
		||||
  def site_title
 | 
			
		||||
    Setting.site_title.to_s
 | 
			
		||||
    Setting.site_title.presence || site_hostname
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def site_hostname
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user