keep a singleton filter around that we can use when no filter is set

rails · Oct 19, 2012 · 481f30e · 481f30e
1 parent 79e91cc
commit 481f30e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/actionpack/lib/action_dispatch/http/filter_parameters.rb b/actionpack/lib/action_dispatch/http/filter_parameters.rb
@@ -22,6 +22,8 @@ module Http
     module FilterParameters
       @@parameter_filter_for  = {}
 
+      NULL_FILTER = ParameterFilter.new # :nodoc:
+
       def initialize(env)
         super
         @filtered_parameters = nil
@@ -47,15 +49,17 @@ def filtered_path
     protected
 
       def parameter_filter
-        parameter_filter_for(@env["action_dispatch.parameter_filter"])
+        parameter_filter_for @env.fetch("action_dispatch.parameter_filter") {
+          return NULL_FILTER
+        }
       end
 
       def env_filter
         parameter_filter_for(Array(@env["action_dispatch.parameter_filter"]) + [/RAW_POST_DATA/, "rack.request.form_vars"])
       end
 
       def parameter_filter_for(filters)
-        @@parameter_filter_for[filters] ||= ParameterFilter.new(filters || [])
+        @@parameter_filter_for[filters] ||= ParameterFilter.new(filters)
       end
 
       KV_RE   = '[^&;=]+'