diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-31 09:34:00 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-31 09:34:00 +0000 |
| commit | 8c8fd338a5ea811040afe3f837e2f9a826eaa1a0 (patch) | |
| tree | 0df5d15ee7581c7fca7c56a36f517a9d1b29dd72 /app/controllers/admin_censor_rule_controller.rb | |
| parent | deaede70df7cf68f380e00f01950b48c0e73a4fa (diff) | |
| parent | e19b4494d1a8901ab60dd5ea7fa116d7c799a92b (diff) | |
Merge branch 'feature/flexible-admin-username' into develop
Diffstat (limited to 'app/controllers/admin_censor_rule_controller.rb')
| -rw-r--r-- | app/controllers/admin_censor_rule_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb index dca312b8b..5381921bf 100644 --- a/app/controllers/admin_censor_rule_controller.rb +++ b/app/controllers/admin_censor_rule_controller.rb @@ -15,7 +15,7 @@ class AdminCensorRuleController < AdminController end def create - params[:censor_rule][:last_edit_editor] = admin_http_auth_user() + params[:censor_rule][:last_edit_editor] = admin_current_user() @censor_rule = CensorRule.new(params[:censor_rule]) if @censor_rule.save if !@censor_rule.info_request.nil? @@ -42,7 +42,7 @@ class AdminCensorRuleController < AdminController end def update - params[:censor_rule][:last_edit_editor] = admin_http_auth_user() + params[:censor_rule][:last_edit_editor] = admin_current_user() @censor_rule = CensorRule.find(params[:id]) if @censor_rule.update_attributes(params[:censor_rule]) if !@censor_rule.info_request.nil? |