]> source.dussan.org Git - redmine.git/commitdiff
Fixes error in RepositoriesHelper#replace_invalid_utf8 when given nil.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 20 Mar 2011 11:33:03 +0000 (11:33 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 20 Mar 2011 11:33:03 +0000 (11:33 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5170 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/repositories_helper.rb

index 0dc450b36a02901d002140c999fc5d3001ebc86a..80887a93749bf4a75b3d051ddcb05c55840cb7f4 100644 (file)
@@ -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?