diff options
| author | José Valim <jose.valim@gmail.com> | 2012-04-24 10:50:44 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-04-24 10:50:44 -0700 |
| commit | 0cc32c5fd7f875de61262b430bca23825691899b (patch) | |
| tree | 0eac235c89ccf3ab5c4a0ccc812662dae91f4b75 /activemodel/lib | |
| parent | f822024cccc5a0d8b16c6a595538f342fd0a6adb (diff) | |
| parent | 692b3b6b6a565a27b968db8027daabcc766cfede (diff) | |
| download | rails-0cc32c5fd7f875de61262b430bca23825691899b.tar.gz rails-0cc32c5fd7f875de61262b430bca23825691899b.tar.bz2 rails-0cc32c5fd7f875de61262b430bca23825691899b.zip | |
Merge pull request #5966 from oscardelben/fix_secure_password_setter
Fix secure_password setter
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/secure_password.rb | 2 |
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 8ab0bccc11..ff2213231f 100644 --- a/activemodel/lib/active_model/secure_password.rb +++ b/activemodel/lib/active_model/secure_password.rb @@ -60,8 +60,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 |