Permalink
Browse files

Move protected instance variables definition, kill compatibility module

  • Loading branch information...
1 parent cb650a5 commit 0b7548fab17c8f50d9bc6ed7e98ef475d73010cc @carlosantoniodasilva carlosantoniodasilva committed Jan 17, 2012
View
7 actionpack/lib/action_controller/base.rb
@@ -228,8 +228,11 @@ def self.without_modules(*modules)
include mod
end
- # Rails 2.x compatibility
- include ActionController::Compatibility
+ # Define some internal variables that should not be propagated to the view.
+ self.protected_instance_variables = [
+ :@_status, :@_headers, :@_params, :@_env, :@_response, :@_request,
+ :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout
+ ]
ActiveSupport.run_load_hooks(:action_controller, self)
end
View
13 actionpack/lib/action_controller/metal/compatibility.rb
@@ -1,13 +0,0 @@
-module ActionController
- module Compatibility
- extend ActiveSupport::Concern
-
- # Temporary hax
- included do
- self.protected_instance_variables = [
- :@_status, :@_headers, :@_params, :@_env, :@_response, :@_request,
- :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout
- ]
- end
- end
-end

0 comments on commit 0b7548f

Please sign in to comment.