Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 09:10:25 +08:00
Code Packages Activity Actions 11

better support for mixed content

Browse source
This commit is contained in:
Régis Hanol 2015-06-01 17:49:58 +02:00
parent 67cc96f20d
commit 81a699e2b0
5 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/controllers/user_avatars_controller.rb
View file

@ -74,16 +74,13 @@ class UserAvatarsController < ApplicationController
if user.uploaded_avatar && !upload
avatar_url = UserAvatar.local_avatar_url(hostname, user.username_lower, user.uploaded_avatar_id, size)
return redirect_to cdn_path(avatar_url)
elsif upload
original = Discourse.store.path_for(upload)
if Discourse.store.external? || File.exists?(original)
if optimized = get_optimized_image(upload, size)
unless optimized.local?
expires_in 1.day, public: true
return redirect_to Discourse.store.cdn_url(optimized.url)
end
image = Discourse.store.path_for(optimized)
end
elsif upload && optimized = get_optimized_image(upload, size)
if optimized.local?
optimized_path = Discourse.store.path_for(optimized)
image = optimized_path if File.exists?(optimized_path)
else
expires_in 1.day, public: true
return redirect_to Discourse.store.cdn_url(optimized.url)
end
end