mirror of
https://github.com/discourse/discourse.git
synced 2025-03-23 22:46:29 +08:00
FIX: Old Upload#url
scheme support for Upload.get_from_url
.
This is for backwards compatibility purposes. Even if `Upload#url` has a format that we don't recognize, we should still return the upload object as long as the upload record is present.
This commit is contained in:
parent
646cdfa449
commit
a8baa6d9e7
@ -26,7 +26,13 @@ module HasUrl
|
|||||||
|
|
||||||
return if uri&.path.blank?
|
return if uri&.path.blank?
|
||||||
data = extract_url(uri.path)
|
data = extract_url(uri.path)
|
||||||
return if data.blank?
|
|
||||||
|
if data.blank?
|
||||||
|
result = nil
|
||||||
|
result ||= self.find_by(url: uri.path)
|
||||||
|
return result
|
||||||
|
end
|
||||||
|
|
||||||
result = nil
|
result = nil
|
||||||
|
|
||||||
if self.name == "Upload"
|
if self.name == "Upload"
|
||||||
|
@ -122,6 +122,12 @@ describe Upload do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it "should return the right upload as long as the upload's URL matches" do
|
||||||
|
upload.update!(url: "/uploads/default/12345/971308e535305c51.png")
|
||||||
|
|
||||||
|
expect(Upload.get_from_url(upload.url)).to eq(upload)
|
||||||
|
end
|
||||||
|
|
||||||
describe 'for a url a tree' do
|
describe 'for a url a tree' do
|
||||||
before do
|
before do
|
||||||
upload.update!(url:
|
upload.update!(url:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user