diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-03-20 11:33:03 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-03-20 11:33:03 +0000 |
commit | 88dc1412d70edbcfe2c0e917b4cdf5891ac80f09 (patch) | |
tree | b96b5228b42dbd4b141d938cf3f87729701568cf /app | |
parent | 2201a343e40d5e22f94b18909cb06ce4b3076c18 (diff) | |
download | redmine-88dc1412d70edbcfe2c0e917b4cdf5891ac80f09.tar.gz redmine-88dc1412d70edbcfe2c0e917b4cdf5891ac80f09.zip |
Fixes error in RepositoriesHelper#replace_invalid_utf8 when given nil.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5170 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/repositories_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 0dc450b36..80887a937 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -148,6 +148,7 @@ module RepositoriesHelper private :to_utf8_internal def replace_invalid_utf8(str) + return str if str.nil? if str.respond_to?(:force_encoding) str.force_encoding('UTF-8') if ! str.valid_encoding? |