diff options
| author | Carlos Galdino + Rafael Mendonça França <rafael.franca+carlos.galdino@plataformatec.com.br> | 2012-05-16 17:10:17 -0300 |
|---|---|---|
| committer | Carlos Galdino + Rafael Mendonça França <rafael.franca+carlos.galdino@plataformatec.com.br> | 2012-05-16 17:10:17 -0300 |
| commit | eb06d582e4cb5f255a3160b2bc3266aafeb3103f (patch) | |
| tree | f894e001efbac73112c4735e0c901fb99d47b00f /activesupport/lib/active_support | |
| parent | 98bfccbdb5c29060f5e042819669b7442b6cd56c (diff) | |
| download | rails-eb06d582e4cb5f255a3160b2bc3266aafeb3103f.tar.gz rails-eb06d582e4cb5f255a3160b2bc3266aafeb3103f.tar.bz2 rails-eb06d582e4cb5f255a3160b2bc3266aafeb3103f.zip | |
Revert "Merge pull request #6354 from lest/patch-1"
This reverts commit e8feaff60b9c04d34ad234f7d17b5d2ad9cc7a24, reversing
changes made to 9adf28c026070afb78b80027521a4ddddd68d697.
Reason: This broke the actionmailer tests
Diffstat (limited to 'activesupport/lib/active_support')
3 files changed, 5 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/access.rb b/activesupport/lib/active_support/core_ext/string/access.rb index 8fa8157d65..5c32a2453d 100644 --- a/activesupport/lib/active_support/core_ext/string/access.rb +++ b/activesupport/lib/active_support/core_ext/string/access.rb @@ -1,3 +1,5 @@ +require 'active_support/multibyte' + class String # If you pass a single Fixnum, returns a substring of one character at that # position. The first character of the string is at position 0, the next at diff --git a/activesupport/lib/active_support/core_ext/string/filters.rb b/activesupport/lib/active_support/core_ext/string/filters.rb index c7e4d5651a..2478f42290 100644 --- a/activesupport/lib/active_support/core_ext/string/filters.rb +++ b/activesupport/lib/active_support/core_ext/string/filters.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/string/multibyte' + class String # Returns the string, first removing all whitespace on both ends of # the string, and then changing remaining consecutive whitespace diff --git a/activesupport/lib/active_support/inflector/transliterate.rb b/activesupport/lib/active_support/inflector/transliterate.rb index 7707b7131e..a372b6d1f7 100644 --- a/activesupport/lib/active_support/inflector/transliterate.rb +++ b/activesupport/lib/active_support/inflector/transliterate.rb @@ -1,5 +1,5 @@ # encoding: utf-8 -require 'active_support/multibyte' +require 'active_support/core_ext/string/multibyte' require 'active_support/i18n' module ActiveSupport |