github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-15 20:32:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: CustomEmoji may contain an invalid upload_id.

Browse Source 
https://meta.discourse.org/t/white-screen-after-deleting-custom-emoji/61608
This commit is contained in:
Guo Xiang Tan 2017-05-05 14:53:38 +08:00
parent 2b21e5ea7e
commit e61959e6a8
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/emoji.rb
View File

@ -95,7 +95,7 @@ class Emoji
CustomEmoji.order(:name).all.each do |emoji|
result << Emoji.new.tap do |e|
e.name = emoji.name
e.url = emoji.upload.url
e.url = emoji.upload&.url
end
end

13
spec/models/emoji_spec.rb
View File

@ -15,4 +15,17 @@ describe Emoji do
expect(Emoji.replacement_code('robin')).to be_nil
end
describe '.load_custom' do
describe 'when a custom emoji has an invalid upload_id' do
it 'should return the custom emoji without a URL' do
CustomEmoji.create!(name: 'test', upload_id: -1)
emoji = Emoji.load_custom.first
expect(emoji.name).to eq('test')
expect(emoji.url).to eq(nil)
end
end
end
end