From 5512e397eeb07b6eec025012c97b3550b0b7ea8c Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 16 Apr 2011 06:44:35 +0000 Subject: [PATCH] scm: prevent PostgreSQL or Ruby 1.9 errors if paths is invalid UTF-8. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5475 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/change.rb | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/models/change.rb b/app/models/change.rb index 657652c9d..a5cfccf22 100644 --- a/app/models/change.rb +++ b/app/models/change.rb @@ -1,30 +1,35 @@ -# redMine - project management software -# Copyright (C) 2006-2007 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class Change < ActiveRecord::Base belongs_to :changeset - + validates_presence_of :changeset_id, :action, :path before_save :init_path - + def relative_path changeset.repository.relative_path(path) end - + + def before_validation + self.path = Redmine::CodesetUtil.replace_invalid_utf8(self.path) + self.from_path = Redmine::CodesetUtil.replace_invalid_utf8(self.from_path) + end + def init_path self.path ||= "" end