aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorOscar Del Ben <info@oscardelben.com>2012-04-24 19:16:01 +0200
committerOscar Del Ben <info@oscardelben.com>2012-04-24 19:16:01 +0200
commit692b3b6b6a565a27b968db8027daabcc766cfede (patch)
tree2009b739bf14875d5e369bd104a9ab2edfb21e02 /activemodel/lib
parent71bd5096beb541866dec7599865b5ea7a693482d (diff)
downloadrails-692b3b6b6a565a27b968db8027daabcc766cfede.tar.gz
rails-692b3b6b6a565a27b968db8027daabcc766cfede.tar.bz2
rails-692b3b6b6a565a27b968db8027daabcc766cfede.zip
Fix secure_password setter
Diffstat (limited to 'activemodel/lib')
-rw-r--r--activemodel/lib/active_model/secure_password.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb
index e7a57cf691..111204d67d 100644
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@@ -64,8 +64,8 @@ module ActiveModel
# Encrypts the password into the password_digest attribute.
def password=(unencrypted_password)
- @password = unencrypted_password
unless unencrypted_password.blank?
+ @password = unencrypted_password
self.password_digest = BCrypt::Password.create(unencrypted_password)
end
end