Merge pull request #51 from geoffgarside/ruby18-issue39

Fix Regexp.escape(filter) for Ruby 1.8.
rails · Oct 24, 2012 · 61e8789 · 61e8789
2 parents 2e74169 + 79d0c0d
commit 61e8789
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/action_controller/parameters.rb b/lib/action_controller/parameters.rb
@@ -44,7 +44,7 @@ def permit(*filters)
         case filter
         when Symbol, String then
           params[filter] = self[filter] if has_key?(filter)
-          keys.grep(/\A#{Regexp.escape(filter)}\(\d+[if]?\)\z/).each { |key| params[key] = self[key] }
+          keys.grep(/\A#{Regexp.escape(filter.to_s)}\(\d+[if]?\)\z/).each { |key| params[key] = self[key] }
         when Hash then
           self.slice(*filter.keys).each do |key, value|
             return unless value