6873fc8026
Upgraded to Rails 2.0.2, except that we maintain vendor/rails/actionpack/lib/action_controller/routing.rb from Rail 1.2.6 (at least for now), so that Routes don't change. We still get to enjoy Rails's many new features. Also fixed a bug in Chunk-handling: disable WikiWord processing in tags (for real this time).
31 lines
741 B
Ruby
31 lines
741 B
Ruby
module ActiveSupport
|
|
module JSON
|
|
module Encoding
|
|
ESCAPED_CHARS = {
|
|
"\010" => '\b',
|
|
"\f" => '\f',
|
|
"\n" => '\n',
|
|
"\r" => '\r',
|
|
"\t" => '\t',
|
|
'"' => '\"',
|
|
'\\' => '\\\\',
|
|
'>' => '\u003E',
|
|
'<' => '\u003C',
|
|
'&' => '\u0026'
|
|
}
|
|
end
|
|
end
|
|
end
|
|
|
|
class String
|
|
def to_json(options = nil) #:nodoc:
|
|
'"' + gsub(/[\010\f\n\r\t"\\><&]/) { |s|
|
|
ActiveSupport::JSON::Encoding::ESCAPED_CHARS[s]
|
|
}.gsub(/([\xC0-\xDF][\x80-\xBF]|
|
|
[\xE0-\xEF][\x80-\xBF]{2}|
|
|
[\xF0-\xF7][\x80-\xBF]{3})+/nx) { |s|
|
|
s.unpack("U*").pack("n*").unpack("H*")[0].gsub(/.{4}/, '\\\\u\&')
|
|
} + '"'
|
|
end
|
|
end
|