Merge commit 'origin/master' into mail

1 files changed, 3 insertions, 3 deletions

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 75be2cc260..6a52854961 100755
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -5,7 +5,7 @@ require 'strscan'
 require 'active_support/memoizable'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/object/tap'
+require 'active_support/core_ext/string/access'
 
 module ActionDispatch
   class Request < Rack::Request
@@ -166,7 +166,7 @@ module ActionDispatch
 
       @env["action_dispatch.request.formats"] ||=
         if parameters[:format]
-          [Mime[parameters[:format]]]
+          Array.wrap(Mime[parameters[:format]])
         elsif xhr? || (accept && !accept.include?(?,))
           accepts
         else
@@ -489,7 +489,7 @@ EOM
         def self.extended(object)
           object.class_eval do
             attr_accessor :original_path, :content_type
-            alias_method :local_path, :path
+            alias_method :local_path, :path if method_defined?(:path)
           end
         end