From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Mar 2011 11:33:03 +0000 (+0000)
Subject: Fixes error in RepositoriesHelper#replace_invalid_utf8 when given nil.
X-Git-Tag: 1.2.0~673
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=88dc1412d70edbcfe2c0e917b4cdf5891ac80f09;p=redmine.git

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
---

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?