Merged rails-3.2 branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/redmine/ciphering.rb b/lib/redmine/ciphering.rb
index 3dd5df826..186709016 100644
--- a/lib/redmine/ciphering.rb
+++ b/lib/redmine/ciphering.rb
@@ -72,7 +72,7 @@ module Redmine
           all.each do |object|
             clear = object.send(attribute)
             object.send "#{attribute}=", clear
-            raise(ActiveRecord::Rollback) unless object.save(false)
+            raise(ActiveRecord::Rollback) unless object.save(:validation => false)
           end
         end ? true : false
       end
@@ -81,8 +81,8 @@ module Redmine
         transaction do
           all.each do |object|
             clear = object.send(attribute)
-            object.write_attribute attribute, clear
-            raise(ActiveRecord::Rollback) unless object.save(false)
+            object.send :write_attribute, attribute, clear
+            raise(ActiveRecord::Rollback) unless object.save(:validation => false)
           end
         end
       end ? true : false