diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-15 16:34:24 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-15 16:34:24 +0400 |
| commit | 21b31a675dd314f987276e64c7c5f7aa9b30f4fb (patch) | |
| tree | 02dc1ed31e65aaa8abdc34742d6fcd5bd83aeb92 /app | |
| parent | bed882e647fbef00305eb1db792c1e3b49849baf (diff) | |
| parent | 22e7f8ffccb91b9d6565f02dfe8c9ef8e6447b3a (diff) | |
Merge pull request #280 from vesln/password-present
Fixing an issue in users#update when password is not present.
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 033332a78e3..85a95de5a17 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -38,7 +38,7 @@ class Admin::UsersController < ApplicationController def update admin = params[:user].delete("admin") - if params[:user][:password].empty? + if params[:user][:password].blank? params[:user].delete(:password) params[:user].delete(:password_confirmation) end |