diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 7c04549f50..e4e8a444e6 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Make sure that the string returned by TextHelper#truncate is actually a string, not a char proxy -- that should only be used internally while working on a multibyte-safe way of truncating [DHH] + * Added FormBuilder#submit as a delegate for FormTagHelper#submit_tag [DHH] * TestSession supports indifferent access so session['foo'] == session[:foo] in your tests. #7372 [julik, jean.helou] diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index e60f6c2986..1698598edb 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -35,7 +35,7 @@ module ActionView def truncate(text, length = 30, truncate_string = "...") if text.nil? then return end l = length - truncate_string.chars.length - text.chars.length > length ? text.chars[0...l] + truncate_string : text + (text.chars.length > length ? text.chars[0...l] + truncate_string : text).to_s end # Highlights +phrase+ everywhere it is found in +text+ by inserting it into |