nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Camo for profile images

Browse source
This commit is contained in:
Dennis Schubert 2014-11-08 21:29:18 +01:00
parent 613f2d1142
commit 0a619749f2
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models/profile.rb
View file

@ -74,7 +74,16 @@ class Profile < ActiveRecord::Base
else else
self[:image_url] self[:image_url]
end end
result || ActionController::Base.helpers.image_path('user/default.png')
unless result
ActionController::Base.helpers.image_path('user/default.png')
else
if AppConfig.privacy.camo.proxy_remote_pod_images?
Diaspora::Camo::image_url(result)
else
result
end
end
end end
def from_omniauth_hash(omniauth_user_hash) def from_omniauth_hash(omniauth_user_hash)