diff options
| author | Michael Koziarski <michael@koziarski.com> | 2006-10-14 00:31:30 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2006-10-14 00:31:30 +0000 |
| commit | 81ddeadd4962f110d51a073a270c844407222593 (patch) | |
| tree | 7c2ff92d6132fd9d9d8234c51e1c0970e3aa373c /actionpack/lib/action_view/helpers/text_helper.rb | |
| parent | d73f32ce0004ddb1a8470ed50c9f8323ebc5613f (diff) | |
| download | rails-81ddeadd4962f110d51a073a270c844407222593.tar.gz rails-81ddeadd4962f110d51a073a270c844407222593.tar.bz2 rails-81ddeadd4962f110d51a073a270c844407222593.zip | |
Replace KCODE checks with String#chars for truncate. Closes #6385 [Manfred Stienstra]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5300 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/text_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 0e142cbaff..33d86441ef 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -20,13 +20,8 @@ module ActionView # if the +text+ is longer than +length+. def truncate(text, length = 30, truncate_string = "...") if text.nil? then return end - l = length - truncate_string.length - if $KCODE == "NONE" - text.length > length ? text[0...l] + truncate_string : text - else - chars = text.split(//) - chars.length > length ? chars[0...l].join + truncate_string : text - end + l = length - truncate_string.chars.length + text.chars.length > length ? text.chars[0...l] + truncate_string : text end # Highlights the +phrase+ where it is found in the +text+ by surrounding it like |