github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 18:13:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Return the CDN's URL when using the site's small logo as the system's user avatar.

Browse Source 
Using "UrlHelper#absolute" returns the S3 URL, which is fine for the client because it modifies it to use the CDN instead. On the other hand, this replacement doesn't happen when the URL is server-side rendered, returning a 403 for the system's avatar.
This commit is contained in:
romanrizzi 2021-01-31 22:35:41 -03:00 committed by Alan Guo Xiang Tan
parent 2f2dd94217
commit 736b4137cc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -873,7 +873,7 @@ class User < ActiveRecord::Base
SiteSetting.logo_small && SiteSetting.use_site_small_logo_as_system_avatar
if use_small_logo
UrlHelper.absolute(SiteSetting.logo_small.url)
Discourse.store.cdn_url(SiteSetting.logo_small.url)
else
self.class.avatar_template(username, uploaded_avatar_id)
end

2
spec/models/user_spec.rb
View File

@ -1339,7 +1339,7 @@ describe User do
describe '#avatar_template' do
it 'uses the small logo if the user is the system user' do
logo_small_url = UrlHelper.absolute(SiteSetting.logo_small.url)
logo_small_url = Discourse.store.cdn_url(SiteSetting.logo_small.url)
expect(Discourse.system_user.avatar_template).to eq(logo_small_url)
end