Fix unicode JSON regexp for Onigurama compatibility. Closes #6494.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5432 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
4d5b913fcf
commit
7b453d2844
@ -1,5 +1,7 @@
|
||||
*SVN*
|
||||
|
||||
* Fix unicode JSON regexp for Onigurama compatibility. #6494 [whitley]
|
||||
|
||||
* update XmlSimple to 1.0.10. Closes #6532. [nicksieger]
|
||||
|
||||
* Update dependencies to allow constants to be defined alongside their siblings. A common case for this is AR model classes with STI; user.rb might define User, Administrator and Guest for example. [Nicholas Seckar]
|
||||
|
@ -32,7 +32,7 @@ module Encoders #:nodoc:
|
||||
ESCAPED_CHARS[s]
|
||||
}.gsub(/([\xC0-\xDF][\x80-\xBF]|
|
||||
[\xE0-\xEF][\x80-\xBF]{2}|
|
||||
[\xF0-\xF7][\x80-\xBF]{3})+/ux) { |s|
|
||||
[\xF0-\xF7][\x80-\xBF]{3})+/nx) { |s|
|
||||
s.unpack("U*").pack("n*").unpack("H*")[0].gsub(/.{4}/, '\\\\u\&')
|
||||
} + '"'
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user