From 423f5ffbc27d8e1ad2bef7b2abd3aecc227544c0 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 3 Sep 2010 17:04:42 +0100
Subject: [PATCH 1/1] Use  config.filter_parameters instead of
 filter_parameter_logging

---
 app/controllers/changeset_controller.rb | 2 --
 app/controllers/user_controller.rb      | 2 --
 config/application.rb                   | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 45b5f80f9..8789476db 100644
--- 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 6354ab478..52573cf5c 100644
--- 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 8a9056631..040ce93e2 100644
--- 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,
-- 
2.43.2