github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-15 21:03:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Uploads not being linked correctly to posts.

Browse Source 
Regression due to 1f636c445b.
This commit is contained in:
Guo Xiang Tan 2018-09-11 23:48:25 -07:00
parent 8922a91c1c
commit f31758cc70
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/upload.rb
View File

@ -177,7 +177,7 @@ class Upload < ActiveRecord::Base
end
return if uri&.path.blank?
data = uri.path.match(/(\/original\/\dX\/[\/\.\w]+\/([a-zA-Z0-9]+)[\.\w]+)/)
data = uri.path.match(/(\/original\/\dX[\/\.\w]*\/([a-zA-Z0-9]+)[\.\w]+)/)
return if data.blank?
sha1 = data[2]
upload = nil

9
spec/models/upload_spec.rb
View File

@ -82,6 +82,15 @@ describe Upload do
expect(Upload.get_from_url(upload.url)).to eq(upload)
end
describe 'for a url without a tree' do
let(:url) { "/uploads/default/original/1X/#{sha1}.png" }
let(:upload) { Fabricate(:upload, url: url, sha1: sha1) }
it 'should return the right upload' do
expect(Upload.get_from_url(upload.url)).to eq(upload)
end
end
it "works when using a cdn" do
begin
original_asset_host = Rails.configuration.action_controller.asset_host