Commit 5bcd5087 authored by Dennis Schubert's avatar Dennis Schubert

Add Camo for remote images

parent 5c9cc493
......@@ -114,7 +114,12 @@ class Photo < ActiveRecord::Base
def url(name = nil)
if remote_photo_path
name = name.to_s + '_' if name
remote_photo_path + name.to_s + remote_photo_name
image_url = remote_photo_path + name.to_s + remote_photo_name
if AppConfig.privacy.camo.proxy_remote_pod_images?
Diaspora::Camo::image_url(image_url)
else
image_url
end
elsif processed?
processed_image.url(name)
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment