diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 11:29:58 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 11:29:58 +0100 |
| commit | 362b1cfdab4115478034e004c85001bb6d7abd68 (patch) | |
| tree | aff7422269c160ab15277e7913646aed1ca32bb5 /app/controllers/admin_censor_rule_controller.rb | |
| parent | 4593cc9e546878d69f795ce75808aae60656213c (diff) | |
| parent | 95e7cd60a2ff78aa8550dc1855ee7c01a0f4c6f2 (diff) | |
Merge branch 'develop' into feature/fix-404-in-themes
Diffstat (limited to 'app/controllers/admin_censor_rule_controller.rb')
| -rw-r--r-- | app/controllers/admin_censor_rule_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb index 2c0c7ca4e..52df8dfc1 100644 --- a/app/controllers/admin_censor_rule_controller.rb +++ b/app/controllers/admin_censor_rule_controller.rb @@ -65,7 +65,7 @@ class AdminCensorRuleController < AdminController render :action => 'edit' end end - + def destroy censor_rule = CensorRule.find(params[:censor_rule_id]) info_request = censor_rule.info_request |