diff app/models/.svn/text-base/changeset.rb.svn-base @ 120:cd2282d2aa55 cannam

Merge from the default branch.  Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).

--- a/app/models/.svn/text-base/changeset.rb.svn-base	Thu Jan 13 13:21:03 2011 +0000
+++ b/app/models/.svn/text-base/changeset.rb.svn-base	Thu Jan 13 14:33:08 2011 +0000
@@ -245,7 +245,13 @@
   end
 
   def self.to_utf8(str)
-    return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
+    if str.respond_to?(:force_encoding)
+      str.force_encoding('UTF-8')
+      return str if str.valid_encoding?
+    else
+      return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
+    end
+
     encoding = Setting.commit_logs_encoding.to_s.strip
     unless encoding.blank? || encoding == 'UTF-8'
       begin