Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix : mixed content of custom emoji #5033

Closed
wants to merge 1 commit into from
Closed

fix : mixed content of custom emoji #5033

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/lib/formatter.rb
View file
Open in desktop
Expand Up @@ -101,6 +101,9 @@ def encode_custom_emojis(html, emojis)
emoji = emoji_map[shortcode]

if emoji
if emoji.match(/^http:\/\/.*/) then
emoji.sub!('http://','//')
end
replacement = "<img draggable=\"false\" class=\"emojione\" alt=\":#{shortcode}:\" title=\":#{shortcode}:\" src=\"#{emoji}\" />"
before_html = shortname_start_index.positive? ? html[0..shortname_start_index - 1] : ''
html = before_html + replacement + html[i + 1..-1]
Expand Down