Merge branch 'rails'

Conflicts:
	actionmailer/lib/action_mailer.rb
	actionmailer/lib/action_mailer/delivery_method/smtp.rb

1 files changed, 13 insertions, 5 deletions

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 4c026fe5f7..48bfbab215 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -19,12 +19,11 @@ module ActionController
 
     # Legacy modules
     include SessionManagement
-    include ActionDispatch::StatusCodes
     include ActionController::Caching
     include ActionController::MimeResponds
 
     # Rails 2.x compatibility
-    include ActionController::Rails2Compatibility
+    include ActionController::Compatibility
 
     include ActionController::Cookies
     include ActionController::Session
@@ -91,7 +90,7 @@ module ActionController
       end
 
       if options[:status]
-        options[:status] = interpret_status(options[:status]).to_i
+        options[:status] = _interpret_status(options[:status])
       end
 
       options[:update] = blk if block_given?
@@ -140,9 +139,9 @@ module ActionController
       raise ActionControllerError.new("Cannot redirect to nil!") if options.nil?
 
       status = if options.is_a?(Hash) && options.key?(:status)
-        interpret_status(options.delete(:status))
+        _interpret_status(options.delete(:status))
       elsif response_status.key?(:status)
-        interpret_status(response_status[:status])
+        _interpret_status(response_status[:status])
       else
         302
       end
@@ -164,5 +163,14 @@ module ActionController
 
       super(url, status)
     end
+
+    private
+      def _interpret_status(status)
+        if status.is_a?(Symbol)
+          (ActionDispatch::StatusCodes::SYMBOL_TO_STATUS_CODE[status] || 500)
+        else
+          status.to_i
+        end
+      end
   end
 end