diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-30 15:25:39 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-30 15:25:39 -0300 |
| commit | 7657a033d3bd19c900b6261ec42261590b7b8fbd (patch) | |
| tree | e0155a27477067a4c1bfb6dc59a8dcfdf1588355 | |
| parent | 4efb36e7b44ae3facb948aa3c5f2790a3fd3b61a (diff) | |
| parent | 29e895770bc341ae8b8fa035f36c24367eeb5e37 (diff) | |
| download | rails-7657a033d3bd19c900b6261ec42261590b7b8fbd.tar.gz rails-7657a033d3bd19c900b6261ec42261590b7b8fbd.tar.bz2 rails-7657a033d3bd19c900b6261ec42261590b7b8fbd.zip | |
Merge pull request #16345 from robin850/rbx-tidy-bytes
Prevent using String#scrub on Rubinius
| -rw-r--r-- | activesupport/lib/active_support/multibyte/unicode.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/multibyte/unicode.rb b/activesupport/lib/active_support/multibyte/unicode.rb index ea3cdcd024..62caff77a3 100644 --- a/activesupport/lib/active_support/multibyte/unicode.rb +++ b/activesupport/lib/active_support/multibyte/unicode.rb @@ -213,7 +213,8 @@ module ActiveSupport end # Ruby >= 2.1 has String#scrub, which is faster than the workaround used for < 2.1. - if '<3'.respond_to?(:scrub) + # Rubinius' String#scrub, however, doesn't support ASCII-incompatible chars. + if '<3'.respond_to?(:scrub) && !defined?(Rubinius) # Replaces all ISO-8859-1 or CP1252 characters by their UTF-8 equivalent # resulting in a valid UTF-8 string. # |