diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-10-29 17:57:10 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-10-29 17:57:10 +0000 |
commit | 48ee58f6b98a56b3f354ad894c1de4a21f14860d (patch) | |
tree | 74e678c7775ee7150034bd0cdce47b62dab21b09 | |
parent | 3601c13b3b7377be82661f6f2890035a5bcbd2db (diff) | |
download | redmine-48ee58f6b98a56b3f354ad894c1de4a21f14860d.tar.gz redmine-48ee58f6b98a56b3f354ad894c1de4a21f14860d.zip |
Merged r2983 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2984 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r-- | app/helpers/application_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 261c8d34e..fa4827b0f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -159,7 +159,7 @@ module ApplicationHelper # Truncates and returns the string as a single line def truncate_single_line(string, *args) - truncate(string, *args).gsub(%r{[\r\n]+}m, ' ') + truncate(string.to_s, *args).gsub(%r{[\r\n]+}m, ' ') end def html_hours(text) |