summaryrefslogtreecommitdiffstats
path: root/app/models/changeset.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-09 23:21:41 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-09 23:21:41 +0000
commitcae3fcce54bd8bb9214520cbdac26a7a4adcc451 (patch)
tree07f6705e3df2f6dbc38405e244a98773bb7b58e7 /app/models/changeset.rb
parentf31df6c02fa9e755d10f6597ac4c17ad97136841 (diff)
downloadredmine-cae3fcce54bd8bb9214520cbdac26a7a4adcc451.tar.gz
redmine-cae3fcce54bd8bb9214520cbdac26a7a4adcc451.zip
scm: use upcase to compare encoding name "UTF-8" in log converting.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5375 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/changeset.rb')
-rw-r--r--app/models/changeset.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index b01809024..9b8ac5d70 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -263,7 +263,7 @@ class Changeset < ActiveRecord::Base
end
enc = encoding.blank? ? "UTF-8" : encoding
if str.respond_to?(:force_encoding)
- if enc != "UTF-8"
+ if enc.upcase != "UTF-8"
str.force_encoding(enc)
str = str.encode("UTF-8", :invalid => :replace,
:undef => :replace, :replace => '?')