1 files changed, 5 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/parameter_encoding.rb b/actionpack/lib/action_controller/metal/parameter_encoding.rb
index f5d3dabb45..c457fd0d06 100644
--- a/actionpack/lib/action_controller/metal/parameter_encoding.rb
+++ b/actionpack/lib/action_controller/metal/parameter_encoding.rb
@@ -1,22 +1,23 @@
 module ActionController
+  # Allows encoding to be specified per parameter per action.
   module ParameterEncoding
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def inherited(klass)
+      def inherited(klass) # :nodoc:
         super
         klass.setup_param_encode
       end
 
-      def setup_param_encode
+      def setup_param_encode # :nodoc:
         @_parameter_encodings = {}
       end
 
-      def encoding_for_param(action, param)
+      def encoding_for_param(action, param) # :nodoc:
         if @_parameter_encodings[action.to_s] && @_parameter_encodings[action.to_s][param.to_s]
           @_parameter_encodings[action.to_s][param.to_s]
         else
-          ::Encoding::UTF_8
+          super
         end
       end