Tidy up new filter_parameters implementation.

3 files changed, 3 insertions, 5 deletions

diff --git a/railties/lib/generators/rails/app/templates/app/controllers/application_controller.rb b/railties/lib/generators/rails/app/templates/app/controllers/application_controller.rb
index 2cdf4eae54..e8065d9505 100644
--- a/railties/lib/generators/rails/app/templates/app/controllers/application_controller.rb
+++ b/railties/lib/generators/rails/app/templates/app/controllers/application_controller.rb
@@ -1,4 +1,3 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  filter_parameter_logging :password
 end
diff --git a/railties/lib/generators/rails/app/templates/config/application.rb b/railties/lib/generators/rails/app/templates/config/application.rb
index 8a7f024a4d..ecebbc6146 100644
--- a/railties/lib/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/generators/rails/app/templates/config/application.rb
@@ -30,9 +30,8 @@ module <%= app_const_base %>
     #   g.template_engine :erb
     #   g.test_framework  :test_unit, :fixture => true
     # end
-    
+
     # Configure sensitive parameters which will be filtered from the log file.
-    # Check the documentation for ActionDispatch::Http::ParametersFilter for more information.
-    # config.filter_parameters :password
+    config.filter_parameters :password
   end
 end
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index ae4f4007e7..a9586b6e9e 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -254,7 +254,7 @@ module Rails
     end
     
     def filter_parameters(*filter_words, &block)
-      ActionDispatch::Http::ParametersFilter.filter_parameters(*filter_words, &block)
+      ActionDispatch::Request.filter_parameters(*filter_words, &block)
     end
 
     def environment_path