FIX: Show title as home logo if title has been set and logo is blank.

https://meta.discourse.org/t/default-text-logo-not-working/103936
This commit is contained in:
Guo Xiang Tan
2019-01-11 15:46:31 +08:00
parent 99856478d6
commit 2956c52e57
3 changed files with 46 additions and 1 deletions

View File

@@ -175,8 +175,19 @@ class SiteSetting < ActiveRecord::Base
site_logo_small_url
site_mobile_logo_url
site_favicon_url
site_home_logo_url
}.each { |client_setting| client_settings << client_setting }
def self.site_home_logo_url
upload = SiteSetting.logo
if SiteSetting.defaults.get(:title) != SiteSetting.title && !upload
''
else
full_cdn_url(upload ? upload.url : '/images/d-logo-sketch.png')
end
end
def self.site_logo_url
upload = self.logo
upload ? full_cdn_url(upload.url) : self.logo_url(warn: false)