FIX: redirect to CDN avatar for s3 avatars

2025-05-21 18:12:32 +08:00 · 2015-05-27 12:02:57 +10:00
parent 0a2a248acc
commit a988cd5abe
4 changed files with 26 additions and 3 deletions
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@ -44,6 +44,10 @@ module FileStore
    def purge_tombstone(grace_period)
    end

+    def cdn_url(url)
+      url
+    end
+
  end

 end
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@ -79,6 +79,14 @@ module FileStore
      end
    end

+    def cdn_url(url)
+      if SiteSetting.s3_cdn_url.present?
+        url.sub(absolute_base_url, SiteSetting.s3_cdn_url)
+      else
+        url
+      end
+    end
+
    private

      def get_path_for_upload(file, upload)