codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: mixed local s3 store missing avatars

Browse source
This commit is contained in:
Sam Saffron 2015-06-01 11:17:42 +10:00
parent e483176006
commit 97f03e699d
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/models/optimized_image.rb
View file

@ -23,11 +23,10 @@ class OptimizedImage < ActiveRecord::Base
return thumbnail unless thumbnail.nil? return thumbnail unless thumbnail.nil?
# create the thumbnail otherwise # create the thumbnail otherwise
original_path = if Discourse.store.external? original_path = Discourse.store.path_for(upload)
if original_path.blank?
external_copy = Discourse.store.download(upload) external_copy = Discourse.store.download(upload)
external_copy.try(:path) original_path = external_copy.try(:path)
else
Discourse.store.path_for(upload)
end end
if original_path.blank? if original_path.blank?

4
spec/models/optimized_image_spec.rb
View file

@ -126,6 +126,10 @@ end
class FakeExternalStore class FakeExternalStore
def path_for(upload)
nil
end
def external? def external?
true true
end end