github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 21:45:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't substitute emojis within code blocks

Browse Source
This commit is contained in:
Robin Ward
2016-03-02 14:31:32 -05:00
parent bfaa4cdb37
commit 0167f6bb57
4 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pretty_text.rb
View File

@ -201,6 +201,12 @@ module PrettyText
end
end
if SiteSetting.enable_emoji?
context.eval("Discourse.Dialect.setUnicodeReplacements(#{Emoji.unicode_replacements_json})");
else
context.eval("Discourse.Dialect.setUnicodeReplacements(null)");
end
# reset emojis (v8 context is shared amongst multisites)
context.eval("Discourse.Dialect.resetEmojis();")
# custom emojis
@ -259,7 +265,6 @@ module PrettyText
options[:topicId] = opts[:topic_id]
working_text = text.dup
Emoji.sub_unicode!(working_text) if SiteSetting.enable_emoji?
sanitized = markdown(working_text, options)
doc = Nokogiri::HTML.fragment(sanitized)