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

BUGFIX: proper multisite support for origin pull CDNs

Browse Source
This commit is contained in:
Sam
2014-05-27 23:13:42 +10:00
parent 18bdc4e63e
commit 0c86d9ed9e
4 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/models/user.js
View File

@ -416,7 +416,7 @@ Discourse.User = Discourse.Model.extend({
Discourse.User.reopenClass(Discourse.Singleton, {
avatarTemplate: function(username, uploadedAvatarId){
var url = Discourse.getURL("/user_avatar/" + username.toLowerCase() + "/{size}/" + uploadedAvatarId + ".png");
var url = Discourse.getURL("/user_avatar/" + Discourse.BaseUrl + "/" + username.toLowerCase() + "/{size}/" + uploadedAvatarId + ".png");
if(Discourse.CDN){
url = Discourse.CDN + url;
}

11
app/controllers/user_avatars_controller.rb
View File

@ -20,8 +20,16 @@ class UserAvatarsController < ApplicationController
end
end
def show
# we need multisite support to keep a single origin pull for CDNs
RailsMultisite::ConnectionManagement.with_hostname(params[:hostname]) do
show_in_site
end
end
protected
def show_in_site
username = params[:username].to_s
return render_dot unless user = User.find_by(username_lower: username.downcase)
@ -62,7 +70,6 @@ class UserAvatarsController < ApplicationController
end
end
protected
# this protects us from a DoS
def render_dot