Use config.filter_parameters instead of filter_parameter_logging

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 45b5f80f9479c7fe8c300d363f77215083e344d8..8789476dbf4a4def010df3b46cc793ccf9f2a540 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -16,8 +16,6 @@ class ChangesetController < ApplicationController
   around_filter :api_call_handle_error, :except => [:list]
   around_filter :web_timeout, :only => [:list]
 
-  filter_parameter_logging "<osmChange version"
-
   # Help methods for checking boundary sanity and area size
   include MapBoundary
 

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 6354ab4782b8da8ee1c5fb252fcea96a44e9b64b..52573cf5c5c85015fabf671252f524eb5c0a03fc 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -15,8 +15,6 @@ class UserController < ApplicationController
   before_filter :require_administrator, :only => [:set_status, :delete, :list]
   before_filter :lookup_this_user, :only => [:set_status, :delete]
 
-  filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
-
   cache_sweeper :user_sweeper, :only => [:account, :set_status, :delete]
 
   def terms

diff --git a/config/application.rb b/config/application.rb
index 8a90566313bb29192a6544cc9e7bb75398c26a22..040ce93e25dd05c8710d2e9a48d2245a6827d837 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -39,7 +39,7 @@ module OpenStreetMap
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
+    config.filter_parameters += [:password, :pass_crypt, :pass_crypt_confirmation]
 
     # Use SQL instead of Active Record's schema dumper when creating the test database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,