diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-05 23:05:41 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-05 23:05:41 -0800 |
| commit | 34f34e300980dfef0b8a8d4515ef84ce1f168417 (patch) | |
| tree | deb3d4895488366d66811c4c2b6b9bc0359b5bcb /activesupport | |
| parent | 6f8ed1cd3fa595a59d7a19d8d383836b456ac803 (diff) | |
| parent | be098f840614bbb71fe26f0e2b4c064b6866c076 (diff) | |
| download | rails-34f34e300980dfef0b8a8d4515ef84ce1f168417.tar.gz rails-34f34e300980dfef0b8a8d4515ef84ce1f168417.tar.bz2 rails-34f34e300980dfef0b8a8d4515ef84ce1f168417.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/inflector.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/inflector.rb b/activesupport/lib/active_support/inflector.rb index 4921b99677..5ff6f50fb3 100644 --- a/activesupport/lib/active_support/inflector.rb +++ b/activesupport/lib/active_support/inflector.rb @@ -284,7 +284,7 @@ module ActiveSupport # The iconv transliteration code doesn't function correctly # on some platforms, but it's very fast where it does function. - elsif "foo" != Inflector.transliterate("föö") + elsif "foo" != (Inflector.transliterate("föö") rescue nil) undef_method :transliterate def transliterate(string) string.mb_chars.normalize(:kd). # Decompose accented characters |